Pass the salt version explicitly

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2023-01-27 11:40:43 +00:00
parent 9de4d68767
commit 3ed7ce13f2
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
2 changed files with 11 additions and 5 deletions

View file

@ -2,6 +2,10 @@
name: build-source-tarball name: build-source-tarball
description: Build Source Tarball description: Build Source Tarball
inputs: inputs:
salt-version:
type: string
required: true
description: The Salt version to set prior to building the tarball.
nox-version: nox-version:
required: false required: false
type: string type: string
@ -28,13 +32,13 @@ runs:
- name: Download Release Changes - name: Download Release Changes
uses: actions/download-artifact@v3 uses: actions/download-artifact@v3
with: with:
name: salt-${{ env.SALT_VERSION }}.diff name: salt-${{ inputs.salt-version }}.diff
- name: Apply release changes - name: Apply release changes
shell: bash shell: bash
run: | run: |
git apply salt-${{ env.SALT_VERSION }}.diff git apply salt-${{ inputs.salt-version }}.diff
rm salt-${{ env.SALT_VERSION }}.diff rm salt-${{ inputs.salt-version }}.diff
- name: Create Source Tarball - name: Create Source Tarball
shell: bash shell: bash
@ -44,12 +48,12 @@ runs:
- name: Create Hash Files - name: Create Hash Files
shell: bash shell: bash
run: | 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 - name: Upload Source Tarball as an Artifact
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: salt-${{ env.SALT_VERSION }}.tar.gz name: salt-${{ inputs.salt-version }}.tar.gz
path: dist/salt-*.tar.gz* path: dist/salt-*.tar.gz*
retention-days: 7 retention-days: 7
if-no-files-found: error if-no-files-found: error

View file

@ -273,6 +273,8 @@ jobs:
- name: Build Source Tarball - name: Build Source Tarball
uses: ./.github/actions/build-source-tarball uses: ./.github/actions/build-source-tarball
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
build-deps-onedir: build-deps-onedir:
name: Build Dependencies Onedir name: Build Dependencies Onedir