From 233b047dab1beaf3e9b225731d8e4379cf4bf20c Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 21 Nov 2024 14:52:17 -0700 Subject: [PATCH] Fix actionlint --- .github/workflows/release.yml | 6 ++++++ .github/workflows/templates/release.yml.jinja | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3b62315142b..863a0d2898d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,6 +61,7 @@ jobs: latest-release: ${{ steps.get-salt-releases.outputs.latest-release }} releases: ${{ steps.get-salt-releases.outputs.releases }} nox-archive-hash: ${{ steps.nox-archive-hash.outputs.nox-archive-hash }} + config: ${{ steps.workflow-config.outputs.config }} steps: - uses: actions/checkout@v4 with: @@ -119,6 +120,11 @@ jobs: run: | echo "nox-archive-hash=${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py', 'pkg/common/env-cleanup-rules.yml', '.github/workflows/build-deps-ci-action.yml') }}" | tee -a "$GITHUB_OUTPUT" + - name: Define workflow config + id: workflow-config + run: | + tools ci workflow-config${{ inputs.skip-salt-pkg-download-test-suite && ' --skip-pkg-download-tests' || '' }} ${{ steps.setup-salt-version.outputs.salt-version }} ${{ github.event_name }} changed-files.json + download-onedir-artifact: name: Download Staging Onedir Artifact runs-on: diff --git a/.github/workflows/templates/release.yml.jinja b/.github/workflows/templates/release.yml.jinja index 1943fe2fe84..9e6e098c80e 100644 --- a/.github/workflows/templates/release.yml.jinja +++ b/.github/workflows/templates/release.yml.jinja @@ -87,6 +87,7 @@ permissions: latest-release: ${{ steps.get-salt-releases.outputs.latest-release }} releases: ${{ steps.get-salt-releases.outputs.releases }} nox-archive-hash: ${{ steps.nox-archive-hash.outputs.nox-archive-hash }} + config: ${{ steps.workflow-config.outputs.config }} steps: - uses: actions/checkout@v4 with: @@ -145,6 +146,14 @@ permissions: run: | echo "nox-archive-hash=<{ nox_archive_hashfiles }>" | tee -a "$GITHUB_OUTPUT" + - name: Define workflow config + id: workflow-config + run: | + tools ci workflow-config<{ prepare_workflow_skip_test_suite }><{ + prepare_workflow_skip_pkg_test_suite }><{ prepare_workflow_skip_pkg_download_test_suite + }> ${{ steps.setup-salt-version.outputs.salt-version }} ${{ github.event_name }} changed-files.json + + <%- endblock prepare_workflow_job %> <%- endif %>