diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index d5f333b..ff2fb71 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,17 +25,17 @@ jobs: build-wheels: needs: - compute-matrix - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: build_type: branch script: "ci/build_wheel.sh" matrix_filter: ${{ needs.compute-matrix.outputs.BUILD_MATRIX }} - wheel-name: pynvjitlink + package-name: pynvjitlink package-type: python build-conda: needs: - compute-matrix - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06 with: build_type: branch script: "ci/build_conda.sh" @@ -44,7 +44,7 @@ jobs: needs: - build-wheels secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/wheels-publish.yaml@branch-25.06 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} @@ -56,7 +56,7 @@ jobs: needs: - build-conda secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-upload-packages.yaml@branch-25.06 with: build_type: ${{ inputs.build_type || 'branch' }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 6da47dd..5767ef7 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -21,10 +21,10 @@ jobs: - test-wheels - test-patch secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-25.06 checks: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.06 with: enable_check_generated_files: false compute-matrix: @@ -40,7 +40,7 @@ jobs: build-conda: needs: - compute-matrix - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.06 with: build_type: pull-request script: "ci/build_conda.sh" @@ -50,7 +50,7 @@ jobs: - build-conda - compute-matrix secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06 with: build_type: pull-request script: "ci/test_conda.sh" @@ -59,7 +59,7 @@ jobs: needs: - build-conda - compute-matrix - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.06 with: build_type: pull-request script: "ci/test_patch.sh" @@ -68,19 +68,19 @@ jobs: build-wheels: needs: - compute-matrix - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.06 with: build_type: pull-request script: "ci/build_wheel.sh" matrix_filter: ${{ needs.compute-matrix.outputs.BUILD_MATRIX }} - wheel-name: pynvjitlink + package-name: pynvjitlink package-type: python test-wheels: needs: - build-wheels - compute-matrix secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.06 with: build_type: pull-request script: "ci/test_wheel.sh" diff --git a/ci/test_conda.sh b/ci/test_conda.sh index ba370f3..d4304a4 100755 --- a/ci/test_conda.sh +++ b/ci/test_conda.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2024, NVIDIA CORPORATION +# Copyright (c) 2024-2025, NVIDIA CORPORATION set -euo pipefail @@ -25,7 +25,7 @@ set +u conda activate test set -u -PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) +PYTHON_CHANNEL=$(rapids-download-conda-from-github python) RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" diff --git a/ci/test_patch.sh b/ci/test_patch.sh index 090e6e7..9e9098d 100755 --- a/ci/test_patch.sh +++ b/ci/test_patch.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2024, NVIDIA CORPORATION +# Copyright (c) 2024-2025, NVIDIA CORPORATION set -euo pipefail @@ -23,7 +23,7 @@ set +u conda activate test set -u -PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python) +PYTHON_CHANNEL=$(rapids-download-conda-from-github python) rapids-print-env diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh index 0d97b1e..234ce84 100755 --- a/ci/test_wheel.sh +++ b/ci/test_wheel.sh @@ -5,13 +5,13 @@ set -euo pipefail rapids-logger "Download Wheel" RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" -RAPIDS_PY_WHEEL_NAME="pynvjitlink_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist/ +WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="pynvjitlink_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github python) RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/ mkdir -p "${RAPIDS_TESTS_DIR}" rapids-logger "Install wheel" -rapids-pip-retry install "$(echo ./dist/pynvjitlink_"${RAPIDS_PY_CUDA_SUFFIX}"*.whl)[test]" +rapids-pip-retry install "$(echo "${WHEELHOUSE}"/pynvjitlink_"${RAPIDS_PY_CUDA_SUFFIX}"*.whl)[test]" rapids-logger "Build Tests" pushd test_binary_generation