chore(bors): merge pull request openebs#743

743: build: support multiple head tags r=tiagolobocastro a=tiagolobocastro When we tag with no changes, we should pick the latest annotated tag. Co-authored-by: Tiago Castro <[email protected]>
dsharma-dc · Feb 14, 2024 · 72cc1e1 · 72cc1e1
2 parents d812c09 + 752ad05
commit 72cc1e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/nix/lib/version.nix b/nix/lib/version.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
     vers=${tag}
     if [ -z "$vers" ]; then
-      vers=`${git}/bin/git tag --points-at HEAD`
+      vers=`${git}/bin/git describe --exact-match 2>/dev/null || echo -n`
     fi
     if [ -z "$vers" ]; then
       vers=`${git}/bin/git rev-parse --short=12 HEAD`

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -16,7 +16,7 @@ dockerhub_tag_exists() {
 
 # Get the tag at the HEAD
 get_tag() {
-  vers=`git tag --points-at HEAD`
+  vers=$(git describe --exact-match 2>/dev/null || echo -n)
   echo -n $vers
 }
 get_hash() {