Merge branch '19937-build-packages-fix'. Closes #19937

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>

diff --git a/build/package-testing/deb-common-test-packages.sh b/build/package-testing/deb-common-test-packages.sh
index 32fb2009e15fa063de0b85622b5b98b0ef74cd1a..cb9d538e8ed5638b04f45d6d319d60973f366936 100755 (executable)
--- a/build/package-testing/deb-common-test-packages.sh
+++ b/build/package-testing/deb-common-test-packages.sh
@@ -50,7 +50,7 @@ if [[ "$DEBUG" != "0" ]]; then
   while read so && [ -n "$so" ]; do
       echo
       echo "== Packages dependencies for $so =="
-      ldd "$so" | awk '($3 ~ /^\//){print $3}' | sort -u | xargs dpkg -S | cut -d: -f1 | sort -u
+      ldd "$so" | awk '($3 ~ /^\//){print $3}' | sort -u | xargs -r dpkg -S | cut -d: -f1 | sort -u
   done <<EOF
 $(find -name '*.so')
 EOF

diff --git a/build/version-at-commit.sh b/build/version-at-commit.sh
index e42b8753934b07581aa69b52950a8cdad5bc521d..50b1e300e79d65d17a5ca2ccc8d07adcfd32543d 100755 (executable)
--- a/build/version-at-commit.sh
+++ b/build/version-at-commit.sh
@@ -8,44 +8,36 @@ commit="$1"
 versionglob="[0-9].[0-9]*.[0-9]*"
 devsuffix="~dev"
 
-# automatically assign version
+# automatically assign *development* version
 #
 # handles the following cases:
 #
-# 1. commit is directly tagged.  print that.
-#
-# 2. commit is on main or a development branch, the nearest tag is older
+# *  commit is on main or a development branch, the nearest tag is older
 #    than commit where this branch joins main.
 #    -> take greatest version tag in repo X.Y.Z and assign X.(Y+1).0
 #
-# 3. commit is on a release branch, the nearest tag is newer
+# *  commit is on a release branch, the nearest tag is newer
 #    than the commit where this branch joins main.
 #    -> take nearest tag X.Y.Z and assign X.Y.(Z+1)
 
-tagged=$(git tag --points-at "$commit")
-
-if [[ -n "$tagged" ]] ; then
-    echo $tagged
-else
-    # 1. get the nearest tag with 'git describe'
-    # 2. get the merge base between this commit and main
-    # 3. if the tag is an ancestor of the merge base,
-    #    (tag is older than merge base) increment minor version
-    #    else, tag is newer than merge base, so increment point version
+# 1. get the nearest tag with 'git describe'
+# 2. get the merge base between this commit and main
+# 3. if the tag is an ancestor of the merge base,
+#    (tag is older than merge base) increment minor version
+#    else, tag is newer than merge base, so increment point version
 
-    nearest_tag=$(git describe --tags --abbrev=0 --match "$versionglob" "$commit")
-    merge_base=$(git merge-base origin/main "$commit")
+nearest_tag=$(git describe --tags --abbrev=0 --match "$versionglob" "$commit")
+merge_base=$(git merge-base origin/main "$commit")
 
-    if git merge-base --is-ancestor "$nearest_tag" "$merge_base" ; then
-        # x.(y+1).0~devTIMESTAMP, where x.y.z is the newest version that does not contain $commit
-       # grep reads the list of tags (-f) that contain $commit and filters them out (-v)
-       # this prevents a newer tag from retroactively changing the versions of everything before it
-        v=$(git tag | grep -vFf <(git tag --contains "$commit") | sort -Vr | head -n1 | perl -pe 's/(\d+)\.(\d+)\.\d+.*/"$1.".($2+1).".0"/e')
-    else
-        # x.y.(z+1)~devTIMESTAMP, where x.y.z is the latest released ancestor of $commit
-        v=$(echo $nearest_tag | perl -pe 's/(\d+)$/$1+1/e')
-    fi
-    isodate=$(TZ=UTC git log -n1 --format=%cd --date=iso "$commit")
-    ts=$(TZ=UTC date --date="$isodate" "+%Y%m%d%H%M%S")
-    echo "${v}${devsuffix}${ts}"
+if git merge-base --is-ancestor "$nearest_tag" "$merge_base" ; then
+    # x.(y+1).0~devTIMESTAMP, where x.y.z is the newest version that does not contain $commit
+    # grep reads the list of tags (-f) that contain $commit and filters them out (-v)
+    # this prevents a newer tag from retroactively changing the versions of everything before it
+    v=$(git tag | grep -vFf <(git tag --contains "$merge_base") | sort -Vr | head -n1 | perl -pe 's/(\d+)\.(\d+)\.\d+.*/"$1.".($2+1).".0"/e')
+else
+    # x.y.(z+1)~devTIMESTAMP, where x.y.z is the latest released ancestor of $commit
+    v=$(echo $nearest_tag | perl -pe 's/(\d+)$/$1+1/e')
 fi
+isodate=$(TZ=UTC git log -n1 --format=%cd --date=iso "$commit")
+ts=$(TZ=UTC date --date="$isodate" "+%Y%m%d%H%M%S")
+echo "${v}${devsuffix}${ts}"