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

TO REVERT: Allow staging runs from hotfix/3006.x/cleanup-tools-commands

Browse source
This commit is contained in:
MKLeb 2023-05-02 20:59:21 -04:00
parent 6cebf73cb5
commit d2d3b63f33
No known key found for this signature in database
GPG key ID: 089B64EA1A99DDD1
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,9 +47,9 @@ jobs:
- name: Check Branch - name: Check Branch
run: | run: |
echo "Trying to run the staging workflow from branch ${{ github.ref_name }}" echo "Trying to run the staging workflow from branch ${{ github.ref_name }}"
if [ "${{ contains(fromJSON('["master", "3006.x"]'), github.ref_name) }}" != "true" ]; then if [ "${{ contains(fromJSON('["master", "3006.x", "hotfix/3006.x/cleanup-tools-commands"]'), github.ref_name) }}" != "true" ]; then
echo "Running the staging workflow from the ${{ github.ref_name }} branch is not allowed" echo "Running the staging workflow from the ${{ github.ref_name }} branch is not allowed"
echo "Allowed branches: master, 3006.x" echo "Allowed branches: master, 3006.x, hotfix/3006.x/cleanup-tools-commands"
exit 1 exit 1
else else
echo "Allowed to release from branch ${{ github.ref_name }}" echo "Allowed to release from branch ${{ github.ref_name }}"

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

@ -60,9 +60,9 @@ jobs:
- name: Check Branch - name: Check Branch
run: | run: |
echo "Trying to run the staging workflow from branch ${{ github.ref_name }}" echo "Trying to run the staging workflow from branch ${{ github.ref_name }}"
if [ "${{ contains(fromJSON('["master", "3006.x"]'), github.ref_name) }}" != "true" ]; then if [ "${{ contains(fromJSON('["master", "3006.x", "hotfix/3006.x/cleanup-tools-commands"]'), github.ref_name) }}" != "true" ]; then
echo "Running the staging workflow from the ${{ github.ref_name }} branch is not allowed" echo "Running the staging workflow from the ${{ github.ref_name }} branch is not allowed"
echo "Allowed branches: master, 3006.x" echo "Allowed branches: master, 3006.x, hotfix/3006.x/cleanup-tools-commands"
exit 1 exit 1
else else
echo "Allowed to release from branch ${{ github.ref_name }}" echo "Allowed to release from branch ${{ github.ref_name }}"

2
.github/workflows/templates/layout.yml.jinja vendored
View file

@ -9,7 +9,7 @@
<%- set skip_junit_reports_check = skip_junit_reports_check|default("${{ github.event_name == 'pull_request' }}") %> <%- set skip_junit_reports_check = skip_junit_reports_check|default("${{ github.event_name == 'pull_request' }}") %>
<%- set gpg_key_id = "64CBBC8173D76B3F" %> <%- set gpg_key_id = "64CBBC8173D76B3F" %>
<%- set prepare_actual_release = prepare_actual_release | default(False) %> <%- set prepare_actual_release = prepare_actual_release | default(False) %>
<%- set release_branches = ["master", "3006.x"] %> <%- set release_branches = ["master", "3006.x", "hotfix/3006.x/cleanup-tools-commands"] %>
--- ---
<%- block name %> <%- block name %>
name: <{ workflow_name }> name: <{ workflow_name }>