Merge branch '3006.x' into fix_saltcloud_btstrap

saltstack · Dec 18, 2024 · 05ddff8 · 05ddff8
2 parents 28f1e3d + 35d1ec3
commit 05ddff8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 0 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,6 +39,7 @@ jobs:
   prepare-workflow:
     name: Prepare Workflow Run
     runs-on: ubuntu-22.04
+    environment: ci
     outputs:
       jobs: ${{ steps.define-jobs.outputs.jobs }}
       changed-files: ${{ steps.process-changed-files.outputs.changed-files }}

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -85,6 +85,7 @@ jobs:
   prepare-workflow:
     name: Prepare Workflow Run
     runs-on: ubuntu-22.04
+    environment: ci
     if: ${{ fromJSON(needs.workflow-requirements.outputs.requirements-met) }}
     needs:
       - workflow-requirements

diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -75,6 +75,7 @@ jobs:
   prepare-workflow:
     name: Prepare Workflow Run
     runs-on: ubuntu-22.04
+    environment: ci
     if: ${{ fromJSON(needs.workflow-requirements.outputs.requirements-met) }}
     needs:
       - workflow-requirements

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -67,6 +67,7 @@ jobs:
   prepare-workflow:
     name: Prepare Workflow Run
     runs-on: ubuntu-22.04
+    environment: ci
     needs:
       - check-requirements
     outputs:

diff --git a/.github/workflows/templates/layout.yml.jinja b/.github/workflows/templates/layout.yml.jinja
@@ -78,6 +78,7 @@ jobs:
   prepare-workflow:
     name: Prepare Workflow Run
     runs-on: ubuntu-22.04
+    environment: ci
     <%- if prepare_workflow_if_check %>
     if: <{ prepare_workflow_if_check }>
     <%- endif %>