mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
create script to determine build number
What a pain. It turns out that github.run_number is counting the number of times a specific workflow has been run - but that's different for different workflows, so using that won't get us a single tag with all the corresponding build artifacts. And sadly I can't find a simple atomic way to increase a GitHUb repo variable, so I came up with this somewhat convoluted dance, using the the fact that a push to an existing brach that isn't a fast-forward will fail. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
3da943dc8a
commit
94c47f64ac
4 changed files with 122 additions and 41 deletions
31
.github/workflows/android.yml
vendored
31
.github/workflows/android.yml
vendored
|
@ -17,14 +17,19 @@ jobs:
|
||||||
- name: checkout sources
|
- name: checkout sources
|
||||||
uses: actions/checkout@v1
|
uses: actions/checkout@v1
|
||||||
|
|
||||||
- name: create release name
|
- name: atomically create or retrieve the build number
|
||||||
id: tag
|
id: build_nr
|
||||||
run: |
|
run: |
|
||||||
export tag=""
|
cd .. # check out parallel to subsurface sources
|
||||||
export is_latest=false
|
url="https://subsurface:${{ secrets.NIGHTLY_BUILDS }}@github.com/subsurface/nightly-builds"
|
||||||
if [ "${{ github.ref_type }}" = "tag" ] ; then tag="${{ github.ref_name }}" ; else tag="latest"; is_latest=true ; fi
|
# the clone followed by the pointless push should verify that the password is stored in the config
|
||||||
echo "tag=${tag}" >> $GITHUB_OUTPUT
|
# that way the script doesn't need the password
|
||||||
echo "is_latest=${is_latest}" >> $GITHUB_OUTPUT
|
git clone -b main https://github.com/subsurface/nightly-builds
|
||||||
|
cd nightly-builds
|
||||||
|
git remote set-url origin "$url"
|
||||||
|
git push origin main
|
||||||
|
cd ..
|
||||||
|
bash -x subsurface/scripts/get-or-create-build-nr.sh ${{ github.sha }}
|
||||||
|
|
||||||
- name: run build
|
- name: run build
|
||||||
id: build
|
id: build
|
||||||
|
@ -51,16 +56,20 @@ jobs:
|
||||||
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
|
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
|
||||||
bash -x ./subsurface/packaging/android/qmake-build.sh
|
bash -x ./subsurface/packaging/android/qmake-build.sh
|
||||||
|
|
||||||
- name: Get current date
|
- name: create version number
|
||||||
id: date
|
id: version_number
|
||||||
run: echo "today=$(date '+%Y-%m-%d')" >> $GITHUB_OUTPUT
|
run: |
|
||||||
|
latest=$(cat ../nightly-builds/latest-subsurface-buildnumber)
|
||||||
|
today=$(date '+%Y-%m-%d')
|
||||||
|
version="$today.$latest"
|
||||||
|
echo "version=$version" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# only publish a 'release' on push events (those include merging a PR)
|
# only publish a 'release' on push events (those include merging a PR)
|
||||||
- name: upload binaries
|
- name: upload binaries
|
||||||
if: github.event_name == 'push'
|
if: github.event_name == 'push'
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
with:
|
with:
|
||||||
tag_name: v${{ steps.date.outputs.today }}.${{ github.run_number }}
|
tag_name: v${{ steps.version_number.outputs.version }}
|
||||||
repository: subsurface/nightly-builds
|
repository: subsurface/nightly-builds
|
||||||
token: ${{ secrets.NIGHTLY_BUILDS }}
|
token: ${{ secrets.NIGHTLY_BUILDS }}
|
||||||
prerelease: false
|
prerelease: false
|
||||||
|
|
26
.github/workflows/mac.yml
vendored
26
.github/workflows/mac.yml
vendored
|
@ -13,6 +13,20 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- name: checkout sources
|
- name: checkout sources
|
||||||
uses: actions/checkout@v1
|
uses: actions/checkout@v1
|
||||||
|
- name: atomically create or retrieve the build number
|
||||||
|
id: build_nr
|
||||||
|
run: |
|
||||||
|
cd .. # check out parallel to subsurface sources
|
||||||
|
url="https://subsurface:${{ secrets.NIGHTLY_BUILDS }}@github.com/subsurface/nightly-builds"
|
||||||
|
# the clone followed by the pointless push should verify that the password is stored in the config
|
||||||
|
# that way the script doesn't need the password
|
||||||
|
git clone -b main https://github.com/subsurface/nightly-builds
|
||||||
|
cd nightly-builds
|
||||||
|
git remote set-url origin "$url"
|
||||||
|
git push origin main
|
||||||
|
cd ..
|
||||||
|
bash -x subsurface/scripts/get-or-create-build-nr.sh ${{ github.sha }}
|
||||||
|
|
||||||
- name: setup Homebrew
|
- name: setup Homebrew
|
||||||
run: brew install hidapi libxslt libjpg libmtp create-dmg confuse
|
run: brew install hidapi libxslt libjpg libmtp create-dmg confuse
|
||||||
- name: set our Qt build
|
- name: set our Qt build
|
||||||
|
@ -40,16 +54,20 @@ jobs:
|
||||||
echo "Created $IMG"
|
echo "Created $IMG"
|
||||||
echo "dmg=$IMG" >> $GITHUB_OUTPUT
|
echo "dmg=$IMG" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Get current date
|
- name: create version number
|
||||||
id: date
|
id: version_number
|
||||||
run: echo "today=$(date '+%Y-%m-%d')" >> $GITHUB_OUTPUT
|
run: |
|
||||||
|
latest=$(cat ../nightly-builds/latest-subsurface-buildnumber)
|
||||||
|
today=$(date '+%Y-%m-%d')
|
||||||
|
version="$today.$latest"
|
||||||
|
echo "version=$version" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# only publish a 'release' on push events (those include merging a PR)
|
# only publish a 'release' on push events (those include merging a PR)
|
||||||
- name: upload binaries
|
- name: upload binaries
|
||||||
if: github.event_name == 'push'
|
if: github.event_name == 'push'
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
with:
|
with:
|
||||||
tag_name: v${{ steps.date.outputs.today }}.${{ github.run_number }}
|
tag_name: v${{ steps.version_number.outputs.version }}
|
||||||
repository: subsurface/nightly-builds
|
repository: subsurface/nightly-builds
|
||||||
token: ${{ secrets.NIGHTLY_BUILDS }}
|
token: ${{ secrets.NIGHTLY_BUILDS }}
|
||||||
prerelease: false
|
prerelease: false
|
||||||
|
|
46
.github/workflows/windows.yml
vendored
46
.github/workflows/windows.yml
vendored
|
@ -17,29 +17,19 @@ jobs:
|
||||||
- name: checkout sources
|
- name: checkout sources
|
||||||
uses: actions/checkout@v1
|
uses: actions/checkout@v1
|
||||||
|
|
||||||
- name: create release name
|
- name: atomically create or retrieve the build number
|
||||||
id: tag
|
id: build_nr
|
||||||
run: |
|
run: |
|
||||||
export tag=""
|
cd .. # check out parallel to subsurface sources
|
||||||
export is_latest=false
|
url="https://subsurface:${{ secrets.NIGHTLY_BUILDS }}@github.com/subsurface/nightly-builds"
|
||||||
if [ "${{ github.ref_type }}" = "tag" ]
|
# the clone followed by the pointless push should verify that the password is stored in the config
|
||||||
then
|
# that way the script doesn't need the password
|
||||||
tag="${{ github.ref_name }}"
|
git clone -b main https://github.com/subsurface/nightly-builds
|
||||||
else
|
cd nightly-builds
|
||||||
tag="latest"
|
git remote set-url origin "$url"
|
||||||
is_latest=true
|
git push origin main
|
||||||
fi
|
cd ..
|
||||||
echo "tag=${tag}" >> $GITHUB_OUTPUT
|
bash -x subsurface/scripts/get-or-create-build-nr.sh ${{ github.sha }}
|
||||||
echo "is_latest=${is_latest}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: tag current version as latest if we don't have a tag
|
|
||||||
if: ${{ steps.tag.outputs.is_latest == 'true' }}
|
|
||||||
uses: rickstaa/action-create-tag@v1
|
|
||||||
with:
|
|
||||||
tag: "latest"
|
|
||||||
tag_exists_error: false
|
|
||||||
force_push_tag: true
|
|
||||||
message: "latest commit to allow 'release' uploads"
|
|
||||||
|
|
||||||
- name: get other dependencies
|
- name: get other dependencies
|
||||||
env:
|
env:
|
||||||
|
@ -58,16 +48,20 @@ jobs:
|
||||||
bash -x subsurface/.github/workflows/scripts/windows-in-container-build.sh 2>&1 | tee build.log
|
bash -x subsurface/.github/workflows/scripts/windows-in-container-build.sh 2>&1 | tee build.log
|
||||||
grep "Built target installer" build.log
|
grep "Built target installer" build.log
|
||||||
|
|
||||||
- name: Get current date
|
- name: create version number
|
||||||
id: date
|
id: version_number
|
||||||
run: echo "today=$(date '+%Y-%m-%d')" >> $GITHUB_OUTPUT
|
run: |
|
||||||
|
latest=$(cat ../nightly-builds/latest-subsurface-buildnumber)
|
||||||
|
today=$(date '+%Y-%m-%d')
|
||||||
|
version="$today.$latest"
|
||||||
|
echo "version=$version" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
# only publish a 'release' on push events (those include merging a PR)
|
# only publish a 'release' on push events (those include merging a PR)
|
||||||
- name: upload binaries
|
- name: upload binaries
|
||||||
if: github.event_name == 'push'
|
if: github.event_name == 'push'
|
||||||
uses: softprops/action-gh-release@v1
|
uses: softprops/action-gh-release@v1
|
||||||
with:
|
with:
|
||||||
tag_name: v${{ steps.date.outputs.today }}.${{ github.run_number }}
|
tag_name: v${{ steps.version_number.outputs.version }}
|
||||||
repository: subsurface/nightly-builds
|
repository: subsurface/nightly-builds
|
||||||
token: ${{ secrets.NIGHTLY_BUILDS }}
|
token: ${{ secrets.NIGHTLY_BUILDS }}
|
||||||
prerelease: false
|
prerelease: false
|
||||||
|
|
60
scripts/get-or-create-build-nr.sh
Normal file
60
scripts/get-or-create-build-nr.sh
Normal file
|
@ -0,0 +1,60 @@
|
||||||
|
#!/bin/bash
|
||||||
|
# this is comically complicated - why does GitHub not have a monotonic number
|
||||||
|
# that tracks how many times any action was kicked off? Or an atomic way to update a variable?
|
||||||
|
# So we use the fact that git itself does a great job of preventing us from overwriting an
|
||||||
|
# existing branch and abuse that to create atomicity
|
||||||
|
|
||||||
|
SHA_BRANCH="branch-for-$1"
|
||||||
|
|
||||||
|
# first - make sure git is configured so we can do stuff
|
||||||
|
git config --global user.email "ci@subsurface-divelog.org"
|
||||||
|
git config --global user.name "Subsurface CI"
|
||||||
|
|
||||||
|
# next, clone the release repo
|
||||||
|
[ -d nightly-builds ] || git clone https://github.com/subsurface/nightly-builds
|
||||||
|
cd nightly-builds
|
||||||
|
|
||||||
|
# this is from the main branch, so this should be the PREVIOUS build number
|
||||||
|
latest=$(<latest-subsurface-buildnumber)
|
||||||
|
|
||||||
|
# now let's see if a branch for the current SHA exists
|
||||||
|
if git checkout $SHA_BRANCH
|
||||||
|
then
|
||||||
|
# one of the other workflows created a release number already
|
||||||
|
latest=$(<latest-subsurface-buildnumber)
|
||||||
|
else
|
||||||
|
# this is almost certainly a race between the different workflow files
|
||||||
|
# the main branch should have held the previous release number
|
||||||
|
# increment by one and write as new build number into the named branch
|
||||||
|
latest=$((latest+1))
|
||||||
|
git checkout -b $SHA_BRANCH
|
||||||
|
echo $latest > latest-subsurface-buildnumber
|
||||||
|
git commit -a -m "record build number for this SHA"
|
||||||
|
|
||||||
|
# now comes the moment of truth - are we the first one?
|
||||||
|
# the push will succeed for exactly one of the workflows
|
||||||
|
if git push https://github.com/subsurface/nightly-builds $SHA_BRANCH
|
||||||
|
then
|
||||||
|
# yay - we win! now let's make sure that we remember this number for next time
|
||||||
|
git checkout main
|
||||||
|
echo $latest > latest-subsurface-buildnumber
|
||||||
|
git commit -a -m "record latest build number in main branch"
|
||||||
|
if ! git push https://github.com/subsurface/nightly-builds main
|
||||||
|
then
|
||||||
|
echo "push to main failed - we'll lose monotonic property"
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# someone else was faster - get the number they wrote
|
||||||
|
git checkout main
|
||||||
|
git branch -D $SHA_BRANCH
|
||||||
|
if ! git checkout -b $SHA_BRANCH
|
||||||
|
then
|
||||||
|
echo "push to $SHA_BRANCH failed, but switching to it failed as well"
|
||||||
|
exit -2
|
||||||
|
fi
|
||||||
|
latest=$(<latest-subsurface-buildnumber)
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
# if we get here, we have the next build number - wow that was weird.
|
||||||
|
echo "Build number is $latest"
|
Loading…
Add table
Add a link
Reference in a new issue