From 0dba10499d3f8386c1abed55d43b0ce58f5d84d9 Mon Sep 17 00:00:00 2001 From: Raymond Douglass Date: Wed, 9 Jun 2021 11:55:41 -0400 Subject: [PATCH] FIX update-version.sh for CalVer --- ci/release/update-version.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index c45d7eacd88..ce681bad378 100755 --- 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 \ No newline at end of file