From a3b0bce2c46a21de727a0414a175658606fd731c Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 13 Dec 2022 18:02:39 -0600 Subject: [PATCH 1/3] Update conda recipes. --- conda/recipes/rapids_core_dependencies/meta.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/conda/recipes/rapids_core_dependencies/meta.yaml b/conda/recipes/rapids_core_dependencies/meta.yaml index 70d9a226..b3597d82 100644 --- a/conda/recipes/rapids_core_dependencies/meta.yaml +++ b/conda/recipes/rapids_core_dependencies/meta.yaml @@ -1,8 +1,8 @@ # Copyright (c) 2022, NVIDIA CORPORATION. {% set version = environ.get('GIT_DESCRIBE_TAG', '0.0.0.dev').lstrip('v') + environ.get('VERSION_SUFFIX', '') %} -{% set cuda_version = '.'.join(environ.get('CUDA', '11.5').split('.')[:2]) %} -{% set cuda_major=cuda_version.split('.')[0] %} +{% set cuda_version = '.'.join(environ['RAPIDS_CUDA_VERSION'].split('.')[:2]) %} +{% set cuda_major = cuda_version.split('.')[0] %} package: name: rapids_core_dependencies @@ -14,8 +14,6 @@ source: build: number: {{ GIT_DESCRIBE_NUMBER }} string: cuda{{ cuda_major }}_{{ GIT_DESCRIBE_HASH }}_{{ GIT_DESCRIBE_NUMBER }} - script_env: - - VERSION_SUFFIX ignore_run_exports_from: - {{ compiler('cuda') }} From 0ceaed67a60d0e38faf8f498cf1d606a3c9f6ed3 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 3 Jan 2023 13:24:45 -0600 Subject: [PATCH 2/3] Use = specifier. --- conda/recipes/rapids_core_dependencies/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/recipes/rapids_core_dependencies/meta.yaml b/conda/recipes/rapids_core_dependencies/meta.yaml index b3597d82..a1c860e6 100644 --- a/conda/recipes/rapids_core_dependencies/meta.yaml +++ b/conda/recipes/rapids_core_dependencies/meta.yaml @@ -26,7 +26,7 @@ requirements: - ninja - sysroot_{{ target_platform }} {{ sysroot_version }} host: - - cudatoolkit {{ cuda_version }}.* + - cudatoolkit ={{ cuda_version }} about: home: https://rapids.ai/ From 2f6240b69f8d37ecc29fd1612db964e4377c3e31 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Tue, 3 Jan 2023 13:31:43 -0600 Subject: [PATCH 3/3] Add pr-builder needs. --- .github/workflows/pr.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index ecd3a23b..b5de7dbc 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -11,6 +11,10 @@ concurrency: jobs: pr-builder: + needs: + - checks + - conda-cpp-build + - conda-cpp-tests secrets: inherit uses: rapidsai/shared-action-workflows/.github/workflows/pr-builder.yaml@main checks: