From b5e93135a052fc2d07f5046e83781626330e5ee0 Mon Sep 17 00:00:00 2001 From: Matt Kubilus Date: Sun, 27 Aug 2023 16:04:06 -0400 Subject: [PATCH 1/4] Use consistent package name --- .github/workflows/unstable_build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unstable_build.yml b/.github/workflows/unstable_build.yml index 4af8ba39..43395be0 100644 --- a/.github/workflows/unstable_build.yml +++ b/.github/workflows/unstable_build.yml @@ -17,14 +17,17 @@ jobs: outputs: calver: ${{ steps.getcalver.outputs.CALVER }} steps: + - uses: actions/checkout@v3 - name: Get CalVer id: getcalver run: | - echo "CALVER="$(date +%Y.%m.%d.%H.%M.%S) > $GITHUB_OUTPUT + echo "CALVER="$(date +%Y.%m.%d.%H.%M.%S) > autoortho/.version + # echo "CALVER="$(date +%Y.%m.%d.%H.%M.%S) > $GITHUB_OUTPUT build: needs: getcalver uses: ./.github/workflows/build_release.yml with: - version: ${{ needs.getcalver.outputs.calver }} + version: unstable + #version: ${{ needs.getcalver.outputs.calver }} relname: unstable From 42a6c67e44d6bfd202ab2102341acf359b27f012 Mon Sep 17 00:00:00 2001 From: Matt Kubilus Date: Sun, 27 Aug 2023 16:04:28 -0400 Subject: [PATCH 2/4] Test on PR --- .github/workflows/unstable_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unstable_build.yml b/.github/workflows/unstable_build.yml index 43395be0..03feb6ea 100644 --- a/.github/workflows/unstable_build.yml +++ b/.github/workflows/unstable_build.yml @@ -10,6 +10,7 @@ on: workflow_dispatch: push: branches: [ main ] + pull_request: jobs: getcalver: From 56b71aa571cc5a1e9cca3db21bed038f96d098f9 Mon Sep 17 00:00:00 2001 From: Matt Kubilus Date: Sun, 27 Aug 2023 17:14:47 -0400 Subject: [PATCH 3/4] Override internal ver --- .github/workflows/build_release.yml | 15 ++++++++++++++- .github/workflows/unstable_build.yml | 5 ++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 19fa2f8b..dbee89a3 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -14,7 +14,10 @@ on: required: false type: boolean default: true - + internalver: + required: false + type: string + default: '' jobs: build-linux: @@ -31,6 +34,11 @@ jobs: sudo apt-get update && sudo apt-get install -y make ca-certificates sudo update-ca-certificates + - name: Optionally set internal version separately + if: ${{ inputs.internalver != '' }} + run: | + echo "${{ inputs.internalver }}" > autoortho/.version + - name: Build run: | make lin_bin VERSION=${{ env.VERNAME }} @@ -69,6 +77,11 @@ jobs: python -m pip install -U -r requirements.txt python -m pip install -U -r requirements-build.txt + - name: Optionally set internal version separately + if: ${{ inputs.internalver != '' }} + run: | + echo "${{ inputs.internalver }}" > autoortho/.version + - name: Build run: | make win_exe VERSION=${{ env.VERNAME }} diff --git a/.github/workflows/unstable_build.yml b/.github/workflows/unstable_build.yml index 03feb6ea..8bcf59c8 100644 --- a/.github/workflows/unstable_build.yml +++ b/.github/workflows/unstable_build.yml @@ -22,13 +22,12 @@ jobs: - name: Get CalVer id: getcalver run: | - echo "CALVER="$(date +%Y.%m.%d.%H.%M.%S) > autoortho/.version - # echo "CALVER="$(date +%Y.%m.%d.%H.%M.%S) > $GITHUB_OUTPUT + echo "CALVER="$(date +%Y.%m.%d.%H.%M.%S) > $GITHUB_OUTPUT build: needs: getcalver uses: ./.github/workflows/build_release.yml with: version: unstable - #version: ${{ needs.getcalver.outputs.calver }} + internalver: ${{ needs.getcalver.outputs.calver }} relname: unstable From 8552aa4673c9ff5263c7ddfedeabb9ecdbf7b45f Mon Sep 17 00:00:00 2001 From: Matt Kubilus Date: Fri, 1 Sep 2023 08:50:47 -0400 Subject: [PATCH 4/4] Don't build on PR --- .github/workflows/unstable_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unstable_build.yml b/.github/workflows/unstable_build.yml index 8bcf59c8..2d8b40bf 100644 --- a/.github/workflows/unstable_build.yml +++ b/.github/workflows/unstable_build.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: push: branches: [ main ] - pull_request: + #pull_request: jobs: getcalver: