Merge pull request #267 from rapidsai/branch-21.06

[gpuCI] Forward-merge branch-21.06 to branch-21.08 [skip ci]
rapidsai · Jun 9, 2021 · 1fb6e7c · 1fb6e7c
2 parents 1dc7423 + ac01b66
commit 1fb6e7c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -12,7 +12,7 @@
 NEXT_FULL_TAG=$1
 
 # Get current version
-CURRENT_TAG=$(git tag | grep -xE 'v[0-9\.]+' | sort --version-sort | tail -n 1 | tr -d 'v')
+CURRENT_TAG=$(git tag --merged HEAD | grep -xE '^v.*' | sort --version-sort | tail -n 1 | tr -d 'v')
 CURRENT_MAJOR=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[1]}')
 CURRENT_MINOR=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[2]}')
 CURRENT_PATCH=$(echo $CURRENT_TAG | awk '{split($0, a, "."); print a[3]}')