From b358c71ade3ead5076e52d27d444c5b740c62bea Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Tue, 21 Jan 2025 20:34:33 +0100 Subject: [PATCH] Get the SHA1 when no tag is present The 'git describe' command finds the most recent tag instead of the SHA1. When trying to build from a repository without any tags, for example in a fork, this causes the build to fail. Use the '--always' option to fallback to the SHA1 in case no tag is present. Signed-off-by: Jef Driesen --- packaging/android/qmake-build.sh | 2 +- packaging/ios/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/android/qmake-build.sh b/packaging/android/qmake-build.sh index d6b885e85..079e267fc 100755 --- a/packaging/android/qmake-build.sh +++ b/packaging/android/qmake-build.sh @@ -379,7 +379,7 @@ for ARCH in $ARCHITECTURES ; do make install popd - CURRENT_SHA=$(cd "$SUBSURFACE_SOURCE"/libdivecomputer ; git describe) + CURRENT_SHA=$(cd "$SUBSURFACE_SOURCE"/libdivecomputer ; git describe --always --long) PREVIOUS_SHA=$(cat "libdivecomputer-${ARCH}.SHA" 2>/dev/null || echo) if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] || [ ! -e "$PKG_CONFIG_PATH/libdivecomputer.pc" ] ; then mkdir -p libdivecomputer-build-"$ARCH" diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 4300e2f00..af1c2011e 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -264,7 +264,7 @@ if [ "$QUICK" != "1" ] ; then if [ ! -f "${PARENT_DIR}/libdivecomputer-build-${ARCH}/git.SHA" ] ; then echo "" > "${PARENT_DIR}/libdivecomputer-build-${ARCH}/git.SHA" fi - CURRENT_SHA=$(cd "${SUBSURFACE_SOURCE}/libdivecomputer" ; git describe) + CURRENT_SHA=$(cd "${SUBSURFACE_SOURCE}/libdivecomputer" ; git describe --always --long) PREVIOUS_SHA=$(cat "${PARENT_DIR}/libdivecomputer-build-${ARCH}/git.SHA") if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] ; then echo "$CURRENT_SHA" > "${PARENT_DIR}/libdivecomputer-build-${ARCH}/git.SHA"