diff --git a/.github/workflows/build-cuvs-image.yml b/.github/workflows/build-cuvs-image.yml index 19c5b493..b38e86f9 100644 --- a/.github/workflows/build-cuvs-image.yml +++ b/.github/workflows/build-cuvs-image.yml @@ -60,7 +60,7 @@ jobs: fetch-depth: 0 - name: Clean up condarc for release builds run: | - GIT_DESCRIBE_TAG="$(git describe --tags --abbrev=0)" + GIT_DESCRIBE_TAG="$(git describe --tags --first-parent --abbrev=0)" GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v' if [[ ! $GIT_DESCRIBE_TAG =~ [a-z] ]]; then echo 'Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel.' diff --git a/.github/workflows/build-rapids-image.yml b/.github/workflows/build-rapids-image.yml index b4e9d3d8..c78a093f 100644 --- a/.github/workflows/build-rapids-image.yml +++ b/.github/workflows/build-rapids-image.yml @@ -61,7 +61,7 @@ jobs: fetch-depth: 0 - name: Clean up condarc for release builds run: | - GIT_DESCRIBE_TAG="$(git describe --tags --abbrev=0)" + GIT_DESCRIBE_TAG="$(git describe --tags --first-parent --abbrev=0)" GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v' if [[ ! $GIT_DESCRIBE_TAG =~ [a-z] ]]; then echo 'Most recent tag is for release, adding the `rapidsai` channel and removing the `rapidsai-nightly` channel.' diff --git a/.github/workflows/build-test-publish-images.yml b/.github/workflows/build-test-publish-images.yml index 50b27213..29833df8 100644 --- a/.github/workflows/build-test-publish-images.yml +++ b/.github/workflows/build-test-publish-images.yml @@ -113,7 +113,7 @@ jobs: - name: Compute RAPIDS_VER id: compute-rapids-ver run: | - GIT_DESCRIBE_TAG="$(git describe --tags --abbrev=0)" + GIT_DESCRIBE_TAG="$(git describe --tags --first-parent --abbrev=0)" GIT_DESCRIBE_TAG="${GIT_DESCRIBE_TAG:1}" # remove leading 'v' ALPHA_TAG="" if [[ $GIT_DESCRIBE_TAG =~ [a-z] ]]; then