mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 09:40:20 +00:00
disable allowing staging releases from this test branch
This commit is contained in:
parent
32d6472a9a
commit
85f268cdcd
3 changed files with 5 additions and 5 deletions
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
|
@ -43,9 +43,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", "hotfix/3006.x/remove-systemd-units-dep"]'), github.ref_name) }}" != "true" ]; then
|
if [ "${{ contains(fromJSON('["master", "3006.x"]'), 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, hotfix/3006.x/remove-systemd-units-dep"
|
echo "Allowed branches: master, 3006.x"
|
||||||
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
4
.github/workflows/staging.yml
vendored
|
@ -52,9 +52,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", "hotfix/3006.x/remove-systemd-units-dep"]'), github.ref_name) }}" != "true" ]; then
|
if [ "${{ contains(fromJSON('["master", "3006.x"]'), 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, hotfix/3006.x/remove-systemd-units-dep"
|
echo "Allowed branches: master, 3006.x"
|
||||||
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
2
.github/workflows/templates/layout.yml.jinja
vendored
|
@ -8,7 +8,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", "hotfix/3006.x/remove-systemd-units-dep"] %>
|
<%- set release_branches = ["master", "3006.x"] %>
|
||||||
---
|
---
|
||||||
<%- block name %>
|
<%- block name %>
|
||||||
name: <{ workflow_name }>
|
name: <{ workflow_name }>
|
||||||
|
|
Loading…
Add table
Reference in a new issue