Skip to content

Commit caefbe7

Browse files
authored
Merge branch 'branch-0.43' into add-telemetry
2 parents f4ddd93 + 3ab39fc commit caefbe7

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

ci/build_cpp.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ rapids-logger "Begin C++ and Python builds"
1919

2020
sccache --zero-stats
2121

22-
rapids-conda-retry mambabuild \
22+
RAPIDS_PACKAGE_VERSION=$(rapids-generate-version) rapids-conda-retry mambabuild \
2323
conda/recipes/ucxx
2424

2525
sccache --show-adv-stats

conda/recipes/ucxx/meta.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
# SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.
22
# SPDX-License-Identifier: BSD-3-Clause
33

4-
{% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') %}
5-
{% set minor_version = version.split('.')[0] + '.' + version.split('.')[1] %}
4+
{% set version = environ['RAPIDS_PACKAGE_VERSION'].lstrip('v') %}
65
{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %}
76
{% set cuda_major = cuda_version.split('.')[0] %}
87
{% set date_string = environ['RAPIDS_DATE_STRING'] %}
@@ -189,7 +188,7 @@ outputs:
189188
script: build_and_install_ucxx.sh
190189
build:
191190
number: {{ GIT_DESCRIBE_NUMBER }}
192-
string: cuda{{ cuda_major }}_py{{ python }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
191+
string: cuda{{ cuda_major }}_py{{ python | replace(".", "") }}_{{ date_string }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }}
193192
ignore_run_exports_from:
194193
- {{ compiler('cuda') }}
195194
- ucx

0 commit comments

Comments
 (0)