From a25fe08fb279096635ff3522b9081ddb31322b5d Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 2 Jan 2024 21:03:43 -0800 Subject: [PATCH] change format of nightly build release numbers They are now the four digit version dash build nr So major.minor.patch.commitsSinceTag-buildNr This makes it easier to correlate the release name and a specific manually built version. Signed-off-by: Dirk Hohndel --- .github/workflows/android.yml | 4 ++-- .github/workflows/mac.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 61ffe0eac..42bca2623 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -61,9 +61,9 @@ jobs: id: version_number if: github.event_name == 'push' run: | + gitversion=$(bash scripts/get-version win) latest=$(cat ../nightly-builds/latest-subsurface-buildnumber) - today=$(date '+%Y-%m-%d') - version="$today.$latest" + version="$gitversion-$latest" echo "version=$version" >> $GITHUB_OUTPUT # only publish a 'release' on push events (those include merging a PR) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index af5e28378..ebe208465 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -59,9 +59,9 @@ jobs: id: version_number if: github.event_name == 'push' run: | + gitversion=$(bash scripts/get-version win) latest=$(cat ../nightly-builds/latest-subsurface-buildnumber) - today=$(date '+%Y-%m-%d') - version="$today.$latest" + version="$gitversion-$latest" echo "version=$version" >> $GITHUB_OUTPUT # only publish a 'release' on push events (those include merging a PR) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 11719acd7..ce20f0f07 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -53,9 +53,9 @@ jobs: id: version_number if: github.event_name == 'push' run: | + gitversion=$(bash scripts/get-version win) latest=$(cat ../nightly-builds/latest-subsurface-buildnumber) - today=$(date '+%Y-%m-%d') - version="$today.$latest" + version="$gitversion-$latest" echo "version=$version" >> $GITHUB_OUTPUT # only publish a 'release' on push events (those include merging a PR)