mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
Pull requests targeting master
should also trigger the logic.
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
parent
bf964ccd25
commit
6b1a49e341
5 changed files with 10 additions and 10 deletions
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
@ -320,7 +320,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
|
if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
|
||||||
tools changelog update-release-notes --next-release --template-only
|
tools changelog update-release-notes --next-release --template-only
|
||||||
else
|
else
|
||||||
tools changelog update-release-notes --template-only
|
tools changelog update-release-notes --template-only
|
||||||
|
@ -330,7 +330,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
|
if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
|
||||||
tools changelog update-release-notes --draft --next-release
|
tools changelog update-release-notes --draft --next-release
|
||||||
tools changelog update-release-notes --next-release
|
tools changelog update-release-notes --next-release
|
||||||
else
|
else
|
||||||
|
|
4
.github/workflows/nightly.yml
vendored
4
.github/workflows/nightly.yml
vendored
|
@ -373,7 +373,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
|
if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
|
||||||
tools changelog update-release-notes --next-release --template-only
|
tools changelog update-release-notes --next-release --template-only
|
||||||
else
|
else
|
||||||
tools changelog update-release-notes --template-only
|
tools changelog update-release-notes --template-only
|
||||||
|
@ -383,7 +383,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
|
if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
|
||||||
tools changelog update-release-notes --draft --next-release
|
tools changelog update-release-notes --draft --next-release
|
||||||
tools changelog update-release-notes --next-release
|
tools changelog update-release-notes --next-release
|
||||||
else
|
else
|
||||||
|
|
4
.github/workflows/scheduled.yml
vendored
4
.github/workflows/scheduled.yml
vendored
|
@ -363,7 +363,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
|
if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
|
||||||
tools changelog update-release-notes --next-release --template-only
|
tools changelog update-release-notes --next-release --template-only
|
||||||
else
|
else
|
||||||
tools changelog update-release-notes --template-only
|
tools changelog update-release-notes --template-only
|
||||||
|
@ -373,7 +373,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
|
if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
|
||||||
tools changelog update-release-notes --draft --next-release
|
tools changelog update-release-notes --draft --next-release
|
||||||
tools changelog update-release-notes --next-release
|
tools changelog update-release-notes --next-release
|
||||||
else
|
else
|
||||||
|
|
4
.github/workflows/staging.yml
vendored
4
.github/workflows/staging.yml
vendored
|
@ -363,7 +363,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
|
if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
|
||||||
tools changelog update-release-notes --next-release --template-only
|
tools changelog update-release-notes --next-release --template-only
|
||||||
else
|
else
|
||||||
tools changelog update-release-notes --template-only
|
tools changelog update-release-notes --template-only
|
||||||
|
@ -373,7 +373,7 @@ jobs:
|
||||||
shell: bash
|
shell: bash
|
||||||
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
|
if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
|
||||||
tools changelog update-release-notes --draft --release --next-release
|
tools changelog update-release-notes --draft --release --next-release
|
||||||
tools changelog update-release-notes --release --next-release
|
tools changelog update-release-notes --release --next-release
|
||||||
else
|
else
|
||||||
|
|
4
.github/workflows/templates/ci.yml.jinja
vendored
4
.github/workflows/templates/ci.yml.jinja
vendored
|
@ -116,7 +116,7 @@ on:
|
||||||
shell: bash
|
shell: bash
|
||||||
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
|
if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
|
||||||
tools changelog update-release-notes --next-release --template-only
|
tools changelog update-release-notes --next-release --template-only
|
||||||
else
|
else
|
||||||
tools changelog update-release-notes --template-only
|
tools changelog update-release-notes --template-only
|
||||||
|
@ -126,7 +126,7 @@ on:
|
||||||
shell: bash
|
shell: bash
|
||||||
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
|
||||||
run: |
|
run: |
|
||||||
if [ "${{ contains(fromJSON('["master"]'), github.ref_name) }}" == "true" ]; then
|
if [ "${{ github.base_ref || github.ref_name }}" == "master" ]; then
|
||||||
tools changelog update-release-notes --draft <%- if prepare_actual_release %> --release <%- endif %> --next-release
|
tools changelog update-release-notes --draft <%- if prepare_actual_release %> --release <%- endif %> --next-release
|
||||||
tools changelog update-release-notes <%- if prepare_actual_release %> --release <%- endif %> --next-release
|
tools changelog update-release-notes <%- if prepare_actual_release %> --release <%- endif %> --next-release
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Reference in a new issue