diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8db1d717e45..67184851006 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -416,7 +416,7 @@ jobs: build-deps-onedir-linux: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-linux'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-linux'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -429,7 +429,7 @@ jobs: build-deps-onedir-macos: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-macos'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-macos'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -442,7 +442,7 @@ jobs: build-deps-onedir-windows: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-windows'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-windows'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -455,7 +455,7 @@ jobs: build-salt-onedir-linux: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-linux'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-linux'] }} needs: - prepare-workflow - build-deps-onedir-linux @@ -470,7 +470,7 @@ jobs: build-salt-onedir-macos: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-macos'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-macos'] }} needs: - prepare-workflow - build-deps-onedir-macos @@ -485,7 +485,7 @@ jobs: build-salt-onedir-windows: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-windows'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-windows'] }} needs: - prepare-workflow - build-deps-onedir-windows diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 21ecd0d0a09..6434acfc176 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -470,7 +470,7 @@ jobs: build-deps-onedir-linux: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-linux'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-linux'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -483,7 +483,7 @@ jobs: build-deps-onedir-macos: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-macos'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-macos'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -496,7 +496,7 @@ jobs: build-deps-onedir-windows: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-windows'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-windows'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -509,7 +509,7 @@ jobs: build-salt-onedir-linux: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-linux'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-linux'] }} needs: - prepare-workflow - build-deps-onedir-linux @@ -524,7 +524,7 @@ jobs: build-salt-onedir-macos: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-macos'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-macos'] }} needs: - prepare-workflow - build-deps-onedir-macos @@ -539,7 +539,7 @@ jobs: build-salt-onedir-windows: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-windows'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-windows'] }} needs: - prepare-workflow - build-deps-onedir-windows diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index f543cd362e6..bb353b0e2bc 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -455,7 +455,7 @@ jobs: build-deps-onedir-linux: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-linux'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-linux'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -468,7 +468,7 @@ jobs: build-deps-onedir-macos: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-macos'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-macos'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -481,7 +481,7 @@ jobs: build-deps-onedir-windows: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-windows'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-windows'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -494,7 +494,7 @@ jobs: build-salt-onedir-linux: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-linux'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-linux'] }} needs: - prepare-workflow - build-deps-onedir-linux @@ -509,7 +509,7 @@ jobs: build-salt-onedir-macos: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-macos'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-macos'] }} needs: - prepare-workflow - build-deps-onedir-macos @@ -524,7 +524,7 @@ jobs: build-salt-onedir-windows: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-windows'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-windows'] }} needs: - prepare-workflow - build-deps-onedir-windows diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index f4444d1340a..d835e463237 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -452,7 +452,7 @@ jobs: build-deps-onedir-linux: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-linux'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-linux'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -465,7 +465,7 @@ jobs: build-deps-onedir-macos: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-macos'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-macos'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -478,7 +478,7 @@ jobs: build-deps-onedir-windows: name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-onedir-windows'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-deps-onedir-windows'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -491,7 +491,7 @@ jobs: build-salt-onedir-linux: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-linux'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-linux'] }} needs: - prepare-workflow - build-deps-onedir-linux @@ -506,7 +506,7 @@ jobs: build-salt-onedir-macos: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-macos'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-macos'] }} needs: - prepare-workflow - build-deps-onedir-macos @@ -521,7 +521,7 @@ jobs: build-salt-onedir-windows: name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-salt-onedir-windows'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['build-salt-onedir-windows'] }} needs: - prepare-workflow - build-deps-onedir-windows diff --git a/.github/workflows/templates/ci.yml.jinja b/.github/workflows/templates/ci.yml.jinja index 579c15055b9..b573d56e32d 100644 --- a/.github/workflows/templates/ci.yml.jinja +++ b/.github/workflows/templates/ci.yml.jinja @@ -249,7 +249,7 @@ <{ job_name }>: <%- do conclusion_needs.append(job_name) %> name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -268,7 +268,7 @@ <{ job_name }>: <%- do conclusion_needs.append(job_name) %> name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -287,7 +287,7 @@ <{ job_name }>: <%- do conclusion_needs.append(job_name) %> name: Build Onedir Dependencies - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }} needs: - prepare-workflow uses: ./.github/workflows/build-deps-onedir.yml @@ -307,7 +307,7 @@ <{ job_name }>: <%- do conclusion_needs.append(job_name) %> name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }} needs: - prepare-workflow - build-deps-onedir-linux @@ -327,7 +327,7 @@ <{ job_name }>: <%- do conclusion_needs.append(job_name) %> name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }} needs: - prepare-workflow - build-deps-onedir-macos @@ -347,7 +347,7 @@ <{ job_name }>: <%- do conclusion_needs.append(job_name) %> name: Build Salt Onedir - if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['<{ job_name }>'] }} + if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['<{ job_name }>'] }} needs: - prepare-workflow - build-deps-onedir-windows