Merge branch 'main' into dboreham/configure-ci-triggers

This commit is contained in:
David Boreham 2023-04-10 06:55:50 -06:00
commit 5bb6689603

View File

@ -21,7 +21,7 @@ jobs:
run: | run: |
./scripts/create_build_tag_file.sh ./scripts/create_build_tag_file.sh
build_tag=$(cat ./app/data/build_tag.txt) build_tag=$(cat ./app/data/build_tag.txt)
echo "build-tag=${build_tag}" >> $GITHUB_OUTPUT echo "build-tag=v${build_tag}" >> $GITHUB_OUTPUT
- name: "Install Python" - name: "Install Python"
uses: cerc-io/setup-python@v4 uses: cerc-io/setup-python@v4
with: with:
@ -32,8 +32,6 @@ jobs:
run: pip install shiv run: pip install shiv
- name: "Build local shiv package" - name: "Build local shiv package"
id: build id: build
# Build has to be done after deciding on the version because
# we bundle the version into the build
run: | run: |
./scripts/build_shiv_package.sh ./scripts/build_shiv_package.sh
result_code=$? result_code=$?