Merge main

This commit is contained in:
David Boreham 2023-04-10 09:20:26 -06:00
commit 4d1f339188

View File

@ -1,11 +1,10 @@
name: Publish name: Publish
on: on:
pull_request: push:
branches: branches:
- main - main
push: - publish-test
branches: '*'
jobs: jobs:
publish: publish:
@ -17,9 +16,9 @@ jobs:
- name: "Get build info" - name: "Get build info"
id: build-info id: build-info
run: | run: |
./scripts/create_build_tag_file.sh build_tag=$(./scripts/create_build_tag_file.sh)
build_tag=$(cat ./app/data/build_tag.txt)
echo "build-tag=v${build_tag}" >> $GITHUB_OUTPUT echo "build-tag=v${build_tag}" >> $GITHUB_OUTPUT
echo "Build tag set to v${build_tag}"
- name: "Install Python" - name: "Install Python"
uses: cerc-io/setup-python@v4 uses: cerc-io/setup-python@v4
with: with:
@ -28,6 +27,8 @@ jobs:
run: python3 --version run: python3 --version
- name: "Install shiv" - name: "Install shiv"
run: pip install shiv run: pip install shiv
- name: "Test things"
run: echo "Build tag is ${{ steps.build-info.outputs.build-tag }}"
- name: "Build local shiv package" - name: "Build local shiv package"
id: build id: build
run: | run: |
@ -35,8 +36,6 @@ jobs:
result_code=$? result_code=$?
echo "package-file=$(ls ./package/*)" >> $GITHUB_OUTPUT echo "package-file=$(ls ./package/*)" >> $GITHUB_OUTPUT
exit $result_code exit $result_code
- name: "Test things"
run: echo "Build tag is: ${{ steps.build-info.outputs.build-tag }}"
- name: "Stage artifact file" - name: "Stage artifact file"
run: | run: |
cp ${{ steps.build.outputs.package-file }} ./laconic-so cp ${{ steps.build.outputs.package-file }} ./laconic-so