mirror of
https://github.com/saltstack/salt.git
synced 2025-04-16 17:50:20 +00:00
Remove the release_branches
check, other rules we have setup lock it up well enough
This commit is contained in:
parent
4e8b77df67
commit
44b2c01855
5 changed files with 0 additions and 45 deletions
11
.github/workflows/release.yml
vendored
11
.github/workflows/release.yml
vendored
|
@ -44,17 +44,6 @@ jobs:
|
|||
require: admin
|
||||
username: ${{ github.triggering_actor }}
|
||||
|
||||
- name: Check Branch
|
||||
run: |
|
||||
echo "Trying to run the staging workflow from branch ${{ github.ref_name }}"
|
||||
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 "Allowed branches: master, 3006.x"
|
||||
exit 1
|
||||
else
|
||||
echo "Allowed to release from branch ${{ github.ref_name }}"
|
||||
fi
|
||||
|
||||
prepare-workflow:
|
||||
name: Prepare Workflow Run
|
||||
runs-on:
|
||||
|
|
11
.github/workflows/staging.yml
vendored
11
.github/workflows/staging.yml
vendored
|
@ -57,17 +57,6 @@ jobs:
|
|||
require: admin
|
||||
username: ${{ github.triggering_actor }}
|
||||
|
||||
- name: Check Branch
|
||||
run: |
|
||||
echo "Trying to run the staging workflow from branch ${{ github.ref_name }}"
|
||||
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 "Allowed branches: master, 3006.x"
|
||||
exit 1
|
||||
else
|
||||
echo "Allowed to release from branch ${{ github.ref_name }}"
|
||||
fi
|
||||
|
||||
prepare-workflow:
|
||||
name: Prepare Workflow Run
|
||||
runs-on: ubuntu-latest
|
||||
|
|
1
.github/workflows/templates/layout.yml.jinja
vendored
1
.github/workflows/templates/layout.yml.jinja
vendored
|
@ -9,7 +9,6 @@
|
|||
<%- set skip_junit_reports_check = skip_junit_reports_check|default("${{ github.event_name == 'pull_request' }}") %>
|
||||
<%- set gpg_key_id = "64CBBC8173D76B3F" %>
|
||||
<%- set prepare_actual_release = prepare_actual_release | default(False) %>
|
||||
<%- set release_branches = ["master", "3006.x"] %>
|
||||
---
|
||||
<%- block name %>
|
||||
name: <{ workflow_name }>
|
||||
|
|
11
.github/workflows/templates/release.yml.jinja
vendored
11
.github/workflows/templates/release.yml.jinja
vendored
|
@ -61,17 +61,6 @@ permissions:
|
|||
require: admin
|
||||
username: ${{ github.triggering_actor }}
|
||||
|
||||
- name: Check Branch
|
||||
run: |
|
||||
echo "Trying to run the staging workflow from branch ${{ github.ref_name }}"
|
||||
if [ "${{ contains(fromJSON('<{ release_branches|tojson }>'), github.ref_name) }}" != "true" ]; then
|
||||
echo "Running the staging workflow from the ${{ github.ref_name }} branch is not allowed"
|
||||
echo "Allowed branches: <{ release_branches|join(', ') }>"
|
||||
exit 1
|
||||
else
|
||||
echo "Allowed to release from branch ${{ github.ref_name }}"
|
||||
fi
|
||||
|
||||
|
||||
<%- endblock pre_jobs %>
|
||||
|
||||
|
|
11
.github/workflows/templates/staging.yml.jinja
vendored
11
.github/workflows/templates/staging.yml.jinja
vendored
|
@ -71,17 +71,6 @@ concurrency:
|
|||
require: admin
|
||||
username: ${{ github.triggering_actor }}
|
||||
|
||||
- name: Check Branch
|
||||
run: |
|
||||
echo "Trying to run the staging workflow from branch ${{ github.ref_name }}"
|
||||
if [ "${{ contains(fromJSON('<{ release_branches|tojson }>'), github.ref_name) }}" != "true" ]; then
|
||||
echo "Running the staging workflow from the ${{ github.ref_name }} branch is not allowed"
|
||||
echo "Allowed branches: <{ release_branches|join(', ') }>"
|
||||
exit 1
|
||||
else
|
||||
echo "Allowed to release from branch ${{ github.ref_name }}"
|
||||
fi
|
||||
|
||||
<%- endblock pre_jobs %>
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue