diff --git a/.github/actions/build-source-tarball/action.yml b/.github/actions/build-source-tarball/action.yml index 3e48b4f0749..e2f496b817e 100644 --- a/.github/actions/build-source-tarball/action.yml +++ b/.github/actions/build-source-tarball/action.yml @@ -2,6 +2,10 @@ name: build-source-tarball description: Build Source Tarball inputs: + salt-version: + type: string + required: true + description: The Salt version to set prior to building the tarball. nox-version: required: false type: string @@ -28,13 +32,13 @@ runs: - name: Download Release Changes uses: actions/download-artifact@v3 with: - name: salt-${{ env.SALT_VERSION }}.diff + name: salt-${{ inputs.salt-version }}.diff - name: Apply release changes shell: bash run: | - git apply salt-${{ env.SALT_VERSION }}.diff - rm salt-${{ env.SALT_VERSION }}.diff + git apply salt-${{ inputs.salt-version }}.diff + rm salt-${{ inputs.salt-version }}.diff - name: Create Source Tarball shell: bash @@ -44,12 +48,12 @@ runs: - name: Create Hash Files shell: bash run: | - tools pkg generate-hashes dist/salt-${{ env.SALT_VERSION }}.tar.gz + tools pkg generate-hashes dist/salt-${{ inputs.salt-version }}.tar.gz - name: Upload Source Tarball as an Artifact uses: actions/upload-artifact@v3 with: - name: salt-${{ env.SALT_VERSION }}.tar.gz + name: salt-${{ inputs.salt-version }}.tar.gz path: dist/salt-*.tar.gz* retention-days: 7 if-no-files-found: error diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d235e6b3a10..7b6bb079454 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -273,6 +273,8 @@ jobs: - name: Build Source Tarball uses: ./.github/actions/build-source-tarball + with: + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" build-deps-onedir: name: Build Dependencies Onedir