mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

CICD: Use correct version information on pull request builds.

Browse source 
Use the version information detected in the manage-version action, as
the actual build is happening in the speculative post-merge branch,
resulting in a bogus 'commit distance' number.

Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
Michael Keller 2024-07-31 00:05:43 +12:00
parent 2b7900b68d
commit df4358d252
3 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
packaging/android/qmake-build.sh
View file

@ -51,6 +51,16 @@ while [ "$#" -gt 0 ] ; do
BUILDNR=$1
shift
;;
-canonicalversion)
shift
CANONICALVERSION=$1
shift
;;
-canonicalversion_4)
shift
CANONICALVERSION_4=$1
shift
;;
-version)
# only update the version info without rebuilding
# this is useful when working with Xcode
@ -86,9 +96,13 @@ mkdir -p "$BUILDROOT"/subsurface-mobile-build
pushd "$BUILDROOT"/subsurface-mobile-build
# set up the Subsurface versions by hand
CANONICALVERSION=$("$SUBSURFACE_SOURCE"/scripts/get-version.sh)
if [ -z "${CANONICALVERSION+X}" ] ; then
CANONICALVERSION=$("$SUBSURFACE_SOURCE"/scripts/get-version.sh)
fi
echo "#define CANONICAL_VERSION_STRING \"$CANONICALVERSION\"" > ssrf-version.h
CANONICALVERSION_4=$("$SUBSURFACE_SOURCE"/scripts/get-version.sh 4)
if [ -z "${CANONICALVERSION_4+X}" ] ; then
CANONICALVERSION_4=$("$SUBSURFACE_SOURCE"/scripts/get-version.sh 4)
fi
echo "#define CANONICAL_VERSION_STRING_4 \"$CANONICALVERSION_4\"" >> ssrf-version.h
popd