Merge pull request #1659 from rapidsai/branch-21.06

[gpuCI] Forward-merge branch-21.06 to branch-21.08 [skip ci]
rapidsai · Jun 9, 2021 · 484e168 · 484e168
2 parents a526f40 + a2a2ba2
commit 484e168
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh
@@ -20,7 +20,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]}')
@@ -51,4 +51,4 @@ for FILE in conda/environments/*.yml; do
    sed_runner "s/dask-cuda=${CURRENT_SHORT_TAG}/dask-cuda=${NEXT_SHORT_TAG}/g" ${FILE};
    sed_runner "s/dask-cudf=${CURRENT_SHORT_TAG}/dask-cudf=${NEXT_SHORT_TAG}/g" ${FILE};
    sed_runner "s/cuxfilter=${CURRENT_SHORT_TAG}/cuxfilter=${NEXT_SHORT_TAG}/g" ${FILE};
-done
+done