diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index a5c44b0c2..804e8e95b 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -9,6 +9,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true +env: + SHARED_ACTIONS_REF: better-download-error-handling + jobs: pr-builder: needs: @@ -16,13 +19,13 @@ jobs: - changed-files - checks - conda-cpp-build - - conda-cpp-tests + # - conda-cpp-tests - conda-python-build - - conda-python-tests + # - conda-python-tests - docs-build - wheel-build-cpp - wheel-build-python - - wheel-tests + # - wheel-tests - devcontainer - telemetry-setup secrets: inherit @@ -40,7 +43,7 @@ jobs: # This gate is here and not at the job level because we need the job to not be skipped, # since other jobs depend on it. if: ${{ vars.TELEMETRY_ENABLED == 'true' }} - uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@main + uses: rapidsai/shared-actions/telemetry-dispatch-stash-base-env-vars@better-download-error-handling check-nightly-ci: # Switch to ubuntu-latest once it defaults to a version of Ubuntu that # provides at least Python 3.11 (see @@ -57,7 +60,7 @@ jobs: needs: - telemetry-setup secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@github-token-attr-split with: files_yaml: | test_cpp: @@ -79,40 +82,40 @@ jobs: secrets: inherit needs: - telemetry-setup - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@github-token-attr-split with: enable_check_generated_files: false - ignored_pr_jobs: telemetry-summarize + ignored_pr_jobs: "telemetry-summarize" conda-cpp-build: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-25.04 - with: - build_type: pull-request - conda-cpp-tests: - needs: [conda-cpp-build, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-25.04 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@github-token-attr-split with: build_type: pull-request + # conda-cpp-tests: + # needs: [conda-cpp-build, changed-files] + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@github-token-attr-split + # if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp + # with: + # build_type: pull-request conda-python-build: needs: conda-cpp-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-25.04 - with: - build_type: pull-request - conda-python-tests: - needs: [conda-python-build, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-25.04 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@github-token-attr-split with: build_type: pull-request + # conda-python-tests: + # needs: [conda-python-build, changed-files] + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@github-token-attr-split + # if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + # with: + # build_type: pull-request docs-build: needs: conda-python-build secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@github-token-attr-split with: build_type: pull-request node_type: "gpu-l4-latest-1" @@ -122,7 +125,7 @@ jobs: wheel-build-cpp: needs: checks secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@github-token-attr-split with: matrix_filter: group_by([.ARCH, (.CUDA_VER|split(".")|map(tonumber)|.[0])]) | map(max_by(.PY_VER|split(".")|map(tonumber))) build_type: pull-request @@ -130,23 +133,23 @@ jobs: wheel-build-python: needs: wheel-build-cpp secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/wheels-build.yaml@github-token-attr-split with: build_type: pull-request script: ci/build_wheel_python.sh - wheel-tests: - needs: [wheel-build-python, changed-files] - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-25.04 - if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python - with: - build_type: pull-request - script: ci/test_wheel.sh + # wheel-tests: + # needs: [wheel-build-python, changed-files] + # secrets: inherit + # uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@github-token-attr-split + # if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python + # with: + # build_type: pull-request + # script: ci/test_wheel.sh devcontainer: secrets: inherit needs: - telemetry-setup - uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-25.04 + uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@github-token-attr-split with: arch: '["amd64"]' cuda: '["12.8"]' @@ -163,4 +166,4 @@ jobs: continue-on-error: true steps: - name: Telemetry summarize - uses: rapidsai/shared-actions/telemetry-dispatch-summarize@main + uses: rapidsai/shared-actions/telemetry-dispatch-summarize@better-download-error-handling diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 8cf64b7b7..eada2d01c 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -30,9 +30,10 @@ rattler-build build --recipe conda/recipes/librmm \ --no-build-id \ --channel-priority disabled \ --output-dir "$RAPIDS_CONDA_BLD_OUTPUT_DIR" \ - "${RATTLER_CHANNELS[@]}" + "${RATTLER_CHANNELS[@]}" \ + 2>&1 | tee telemetry-artifacts/build.log -sccache --show-adv-stats +sccache --show-adv-stats | tee telemetry-artifacts/sccache-stats.txt # remove build_cache directory rm -rf "$RAPIDS_CONDA_BLD_OUTPUT_DIR"/build_cache diff --git a/ci/build_python.sh b/ci/build_python.sh index 4f9b30ce7..c315daa38 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -35,9 +35,10 @@ rattler-build build --recipe conda/recipes/rmm \ --channel-priority disabled \ --output-dir "$RAPIDS_CONDA_BLD_OUTPUT_DIR" \ -c "${CPP_CHANNEL}" \ - "${RATTLER_CHANNELS[@]}" + "${RATTLER_CHANNELS[@]}" \ + 2>&1 | tee telemetry-artifacts/build.log -sccache --show-adv-stats +sccache --show-adv-stats | tee telemetry-artifacts/sccache-stats.txt # See https://github.com/prefix-dev/rattler-build/issues/1424 rm -rf "$RAPIDS_CONDA_BLD_OUTPUT_DIR"/build_cache diff --git a/ci/build_wheel_cpp.sh b/ci/build_wheel_cpp.sh index 9396e9cc5..23f325322 100755 --- a/ci/build_wheel_cpp.sh +++ b/ci/build_wheel_cpp.sh @@ -16,9 +16,9 @@ cd "${package_dir}" sccache --zero-stats -rapids-pip-retry wheel . -w dist -v --no-deps --disable-pip-version-check +rapids-pip-retry wheel . -w dist -v --no-deps --disable-pip-version-check 2>&1 | tee ../../telemetry-artifacts/build.log -sccache --show-adv-stats +sccache --show-adv-stats | tee ../../telemetry-artifacts/sccache-stats.txt python -m wheel tags --platform any dist/* --remove diff --git a/ci/build_wheel_python.sh b/ci/build_wheel_python.sh index 3fff53dfe..44d90b744 100755 --- a/ci/build_wheel_python.sh +++ b/ci/build_wheel_python.sh @@ -25,9 +25,9 @@ echo "librmm-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo "${CPP_WHEELHOUSE}"/librmm sccache --zero-stats PIP_CONSTRAINT="${PWD}/build-constraints.txt" \ - rapids-pip-retry wheel . -w dist -v --no-deps --disable-pip-version-check + rapids-pip-retry wheel . -w dist -v --no-deps --disable-pip-version-check 2>&1 | tee ../../telemetry-artifacts/build.log -sccache --show-adv-stats +sccache --show-adv-stats | tee ../../telemetry-artifacts/sccache-stats.txt mkdir -p final_dist EXCLUDE_ARGS=(