From fbbf6ea27fe0383921454abbb43d268c83de5c3a Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 1 Jun 2023 17:22:47 -0500 Subject: [PATCH] Upload conda packages for rapids_core_dependencies. (#414) This PR uploads conda packages as CI artifacts for `rapids_core_dependencies`. I also aligned some bits of rapids-cmake's testing scripts/workflows with other RAPIDS repos. Authors: - Bradley Dice (https://github.com/bdice) Approvers: - AJ Schmidt (https://github.com/ajschmidt8) - Vyas Ramasubramani (https://github.com/vyasr) URL: https://github.com/rapidsai/rapids-cmake/pull/414 --- .github/workflows/build.yaml | 10 +++++++++- .github/workflows/test.yaml | 3 +-- ci/build_cpp.sh | 5 +++++ ci/test_cpp.sh | 7 +++++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 64f66cd2..b2de1180 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -31,7 +31,15 @@ jobs: uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-build.yaml@branch-23.08 with: build_type: ${{ inputs.build_type || 'branch' }} - repo: rapidsai/rapids-cmake + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + upload-conda: + needs: [cpp-build] + secrets: inherit + uses: rapidsai/shared-action-workflows/.github/workflows/conda-upload-packages.yaml@branch-23.06 + with: + build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7751977a..fba047b1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -1,4 +1,4 @@ -name: nightly +name: test on: workflow_dispatch: @@ -19,7 +19,6 @@ jobs: uses: rapidsai/shared-action-workflows/.github/workflows/conda-cpp-tests.yaml@branch-23.08 with: build_type: nightly - repo: rapidsai/rapids-cmake branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 0967624e..1daef26b 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -1,11 +1,16 @@ #!/bin/bash +# Copyright (c) 2023, NVIDIA CORPORATION. set -euo pipefail source rapids-env-update +export CMAKE_GENERATOR=Ninja + rapids-print-env rapids-logger "Begin cpp build" rapids-mamba-retry mambabuild conda/recipes/rapids_core_dependencies + +rapids-upload-conda-to-s3 cpp diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index d36dc004..df9f3af7 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -1,17 +1,20 @@ #!/bin/bash # Copyright (c) 2023, NVIDIA CORPORATION. + set -euo pipefail -rapids-logger "Create test conda environment" . /opt/conda/etc/profile.d/conda.sh +rapids-logger "Generate C++ testing dependencies" rapids-dependency-file-generator \ --output conda \ --file_key test \ --matrix "cuda=${RAPIDS_CUDA_VERSION%.*};arch=$(arch)" | tee env.yaml rapids-mamba-retry env create --force -f env.yaml -n test -set +eu + +# Temporarily allow unbound variables for conda activation. +set +u conda activate test set -u