saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Pull requests targeting master should also trigger the logic.

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-05-08 22:00:24 +01:00 • committed by Megan Wilhite
parent bf964ccd25
commit 6b1a49e341
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -320,7 +320,7 @@ jobs:
shell: bash
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
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
else
tools changelog update-release-notes --template-only
@ -330,7 +330,7 @@ jobs:
shell: bash
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
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 --next-release
else

4
.github/workflows/nightly.yml vendored
View file

@ -373,7 +373,7 @@ jobs:
shell: bash
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
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
else
tools changelog update-release-notes --template-only
@ -383,7 +383,7 @@ jobs:
shell: bash
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
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 --next-release
else

4
.github/workflows/scheduled.yml vendored
View file

@ -363,7 +363,7 @@ jobs:
shell: bash
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
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
else
tools changelog update-release-notes --template-only
@ -373,7 +373,7 @@ jobs:
shell: bash
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
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 --next-release
else

4
.github/workflows/staging.yml vendored
View file

@ -363,7 +363,7 @@ jobs:
shell: bash
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
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
else
tools changelog update-release-notes --template-only
@ -373,7 +373,7 @@ jobs:
shell: bash
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
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 --release --next-release
else

4
.github/workflows/templates/ci.yml.jinja vendored
View file

@ -116,7 +116,7 @@ on:
shell: bash
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
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
else
tools changelog update-release-notes --template-only
@ -126,7 +126,7 @@ on:
shell: bash
if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}
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 <%- if prepare_actual_release %> --release <%- endif %> --next-release
else