From 1d416ed1ded172346d86339287e0af4875e8d160 Mon Sep 17 00:00:00 2001 From: VenkateshJaya Date: Fri, 25 Apr 2025 17:34:54 -0700 Subject: [PATCH 1/3] added custom nightly build repo input --- .github/workflows/conda-cpp-tests.yaml | 17 ++++++++++++----- .github/workflows/conda-python-tests.yaml | 16 +++++++++++----- .github/workflows/wheels-test.yaml | 5 +++++ 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/.github/workflows/conda-cpp-tests.yaml b/.github/workflows/conda-cpp-tests.yaml index ca487730..9a7eae30 100644 --- a/.github/workflows/conda-cpp-tests.yaml +++ b/.github/workflows/conda-cpp-tests.yaml @@ -28,6 +28,10 @@ on: required: false type: string default: "-e _NOOP" + nightly_build_repo: + description: 'Custom workflow file name (other than build.yaml) to download artifacts from for nightly tests' + required: false + type: string defaults: run: @@ -154,12 +158,15 @@ jobs: if: ${{ vars.TELEMETRY_ENABLED == 'true' && github.run_attempt == '1'}} with: extra_attributes: "rapids.PACKAGER=conda,rapids.CUDA_VER=${{ matrix.CUDA_VER }},rapids.PY_VER=${{ matrix.PY_VER }},rapids.ARCH=${{ matrix.ARCH }},rapids.LINUX_VER=${{ matrix.LINUX_VER }},rapids.GPU=${{ matrix.GPU }},rapids.DRIVER=${{ matrix.DRIVER }},rapids.DEPENDENCIES=${{ matrix.DEPENDENCIES }}" + - name: Standardize repository information - run: | - echo "RAPIDS_REPOSITORY=${{ inputs.repo || github.repository }}" >> "${GITHUB_ENV}" - echo "RAPIDS_SHA=$(git rev-parse HEAD)" >> "${GITHUB_ENV}" - echo "RAPIDS_REF_NAME=${{ inputs.branch || github.ref_name }}" >> "${GITHUB_ENV}" - echo "RAPIDS_NIGHTLY_DATE=${{ inputs.date }}" >> "${GITHUB_ENV}" + uses: rapidsai/shared-actions/rapids-github-info@main + with: + repo: ${{ inputs.repo }} + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + nightly_build_repo: ${{ inputs.nightly_build_repo }} - name: Setup proxy cache uses: nv-gha-runners/setup-proxy-cache@main diff --git a/.github/workflows/conda-python-tests.yaml b/.github/workflows/conda-python-tests.yaml index efcfc2b6..276adabe 100644 --- a/.github/workflows/conda-python-tests.yaml +++ b/.github/workflows/conda-python-tests.yaml @@ -31,6 +31,10 @@ on: required: false type: string default: "-e _NOOP" + nightly_build_repo: + description: 'Custom workflow file name (other than build.yaml) to download artifacts from for nightly tests' + required: false + type: string defaults: run: @@ -152,11 +156,13 @@ jobs: fetch-depth: 0 - name: Standardize repository information - run: | - echo "RAPIDS_REPOSITORY=${{ inputs.repo || github.repository }}" >> "${GITHUB_ENV}" - echo "RAPIDS_SHA=$(git rev-parse HEAD)" >> "${GITHUB_ENV}" - echo "RAPIDS_REF_NAME=${{ inputs.branch || github.ref_name }}" >> "${GITHUB_ENV}" - echo "RAPIDS_NIGHTLY_DATE=${{ inputs.date }}" >> "${GITHUB_ENV}" + uses: rapidsai/shared-actions/rapids-github-info@main + with: + repo: ${{ inputs.repo }} + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + nightly_build_repo: ${{ inputs.nightly_build_repo }} # This has to be AFTER the checkout step. It creates a telemetry-artifacts directory, # and the checkout step would destroy it. diff --git a/.github/workflows/wheels-test.yaml b/.github/workflows/wheels-test.yaml index 89bb8b4a..519666d4 100644 --- a/.github/workflows/wheels-test.yaml +++ b/.github/workflows/wheels-test.yaml @@ -40,6 +40,10 @@ on: required: false type: string default: '' + nightly_build_repo: + description: 'Custom workflow file name (other than build.yaml) to download artifacts from for nightly tests' + required: false + type: string defaults: run: @@ -175,6 +179,7 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} + nightly_build_repo: ${{ inputs.nightly_build_repo }} - name: Setup proxy cache uses: nv-gha-runners/setup-proxy-cache@main From 1cafca14c160a404453ac18f573dcd64e3ecc084 Mon Sep 17 00:00:00 2001 From: VenkateshJaya Date: Mon, 28 Apr 2025 14:32:07 -0700 Subject: [PATCH 2/3] changed name of input --- .github/workflows/conda-cpp-post-build-checks.yaml | 2 +- .github/workflows/conda-cpp-tests.yaml | 6 +++--- .github/workflows/conda-python-tests.yaml | 6 +++--- .github/workflows/wheels-test.yaml | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/conda-cpp-post-build-checks.yaml b/.github/workflows/conda-cpp-post-build-checks.yaml index 1f72ac22..2cec30fe 100644 --- a/.github/workflows/conda-cpp-post-build-checks.yaml +++ b/.github/workflows/conda-cpp-post-build-checks.yaml @@ -71,7 +71,7 @@ jobs: echo "RAPIDS_NIGHTLY_DATE=${{ inputs.date }}" >> "${GITHUB_ENV}" - name: Download conda C++ build artifacts run: | - CPP_DIR=$(rapids-download-conda-from-s3 cpp) + CPP_DIR=$(rapids-download-conda-from-github cpp) EXTRACTED_DIR=$(rapids-extract-conda-files "${CPP_DIR}") echo "RAPIDS_EXTRACTED_DIR=${EXTRACTED_DIR}" >> "${GITHUB_ENV}" - name: Get weak detection tool diff --git a/.github/workflows/conda-cpp-tests.yaml b/.github/workflows/conda-cpp-tests.yaml index 9a7eae30..d4a0b37a 100644 --- a/.github/workflows/conda-cpp-tests.yaml +++ b/.github/workflows/conda-cpp-tests.yaml @@ -28,8 +28,8 @@ on: required: false type: string default: "-e _NOOP" - nightly_build_repo: - description: 'Custom workflow file name (other than build.yaml) to download artifacts from for nightly tests' + build_workflow_name: + description: 'Custom workflow file name (defaults to build.yaml) to download artifacts from for tests' required: false type: string @@ -166,7 +166,7 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - nightly_build_repo: ${{ inputs.nightly_build_repo }} + build_workflow_name: ${{ inputs.build_workflow_name }} - name: Setup proxy cache uses: nv-gha-runners/setup-proxy-cache@main diff --git a/.github/workflows/conda-python-tests.yaml b/.github/workflows/conda-python-tests.yaml index 276adabe..c40ffca2 100644 --- a/.github/workflows/conda-python-tests.yaml +++ b/.github/workflows/conda-python-tests.yaml @@ -31,8 +31,8 @@ on: required: false type: string default: "-e _NOOP" - nightly_build_repo: - description: 'Custom workflow file name (other than build.yaml) to download artifacts from for nightly tests' + build_workflow_name: + description: 'Custom workflow file name (defaults to build.yaml) to download artifacts from for tests' required: false type: string @@ -162,7 +162,7 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - nightly_build_repo: ${{ inputs.nightly_build_repo }} + build_workflow_name: ${{ inputs.build_workflow_name }} # This has to be AFTER the checkout step. It creates a telemetry-artifacts directory, # and the checkout step would destroy it. diff --git a/.github/workflows/wheels-test.yaml b/.github/workflows/wheels-test.yaml index 519666d4..486b46ac 100644 --- a/.github/workflows/wheels-test.yaml +++ b/.github/workflows/wheels-test.yaml @@ -40,8 +40,8 @@ on: required: false type: string default: '' - nightly_build_repo: - description: 'Custom workflow file name (other than build.yaml) to download artifacts from for nightly tests' + build_workflow_name: + description: 'Custom workflow file name (defaults to build.yaml) to download artifacts from for tests' required: false type: string @@ -179,7 +179,7 @@ jobs: branch: ${{ inputs.branch }} date: ${{ inputs.date }} sha: ${{ inputs.sha }} - nightly_build_repo: ${{ inputs.nightly_build_repo }} + build_workflow_name: ${{ inputs.build_workflow_name }} - name: Setup proxy cache uses: nv-gha-runners/setup-proxy-cache@main From c34104add6afc03e883703bc839fc300cb63fd2a Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 28 May 2025 11:53:47 -0500 Subject: [PATCH 3/3] expand comment, include custom-job --- .github/workflows/conda-cpp-tests.yaml | 4 +++- .github/workflows/conda-python-tests.yaml | 4 +++- .github/workflows/custom-job.yaml | 24 ++++++++++++----------- .github/workflows/wheels-test.yaml | 4 +++- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/.github/workflows/conda-cpp-tests.yaml b/.github/workflows/conda-cpp-tests.yaml index 7b4095ba..c2d01414 100644 --- a/.github/workflows/conda-cpp-tests.yaml +++ b/.github/workflows/conda-cpp-tests.yaml @@ -30,7 +30,9 @@ on: type: string default: "-e _NOOP" build_workflow_name: - description: 'Custom workflow file name (defaults to build.yaml) to download artifacts from for tests' + description: | + Name of a workflow file that produced artifacts to be downloaded in this run. + If not set (the default), artifact-handling scripts use RAPIDS-conventional defaults (like "build.yaml" when "build_type == nightly"). required: false type: string diff --git a/.github/workflows/conda-python-tests.yaml b/.github/workflows/conda-python-tests.yaml index 2c7e04d3..9e908aab 100644 --- a/.github/workflows/conda-python-tests.yaml +++ b/.github/workflows/conda-python-tests.yaml @@ -33,7 +33,9 @@ on: type: string default: "-e _NOOP" build_workflow_name: - description: 'Custom workflow file name (defaults to build.yaml) to download artifacts from for tests' + description: | + Name of a workflow file that produced artifacts to be downloaded in this run. + If not set (the default), artifact-handling scripts use RAPIDS-conventional defaults (like "build.yaml" when "build_type == nightly"). required: false type: string diff --git a/.github/workflows/custom-job.yaml b/.github/workflows/custom-job.yaml index 1085590d..43abbbcb 100644 --- a/.github/workflows/custom-job.yaml +++ b/.github/workflows/custom-job.yaml @@ -33,6 +33,12 @@ on: type: boolean required: false default: false + build_workflow_name: + description: | + Name of a workflow file that produced artifacts to be downloaded in this run. + If not set (the default), artifact-handling scripts use RAPIDS-conventional defaults (like "build.yaml" when "build_type == nightly"). + required: false + type: string defaults: run: @@ -88,17 +94,13 @@ jobs: run: | echo "RAPIDS_BASE_BRANCH=${{ fromJSON(steps.get-pr-info.outputs.pr-info).base.ref }}" >> "${GITHUB_ENV}" - name: Standardize repository information - env: - RAPIDS_REPOSITORY: ${{ inputs.repo || github.repository }} - RAPIDS_REF_NAME: ${{ inputs.branch || github.ref_name }} - RAPIDS_NIGHTLY_DATE: ${{ inputs.date }} - run: | - { - echo "RAPIDS_REPOSITORY=${RAPIDS_REPOSITORY}" - echo "RAPIDS_SHA=$(git rev-parse HEAD)" - echo "RAPIDS_REF_NAME=${RAPIDS_REF_NAME}" - echo "RAPIDS_NIGHTLY_DATE=${RAPIDS_NIGHTLY_DATE}" - } >> "${GITHUB_ENV}" + uses: rapidsai/shared-actions/rapids-github-info@main + with: + repo: ${{ inputs.repo }} + branch: ${{ inputs.branch }} + date: ${{ inputs.date }} + sha: ${{ inputs.sha }} + build_workflow_name: ${{ inputs.build_workflow_name }} # Per the docs at https://docs.github.com/en/rest/rate-limit/rate-limit?apiVersion=2022-11-28#get-rate-limit-status-for-the-authenticated-user, # checking '/rate_limit | jq .' should not itself count against any rate limits. - name: Check GitHub API rate limits diff --git a/.github/workflows/wheels-test.yaml b/.github/workflows/wheels-test.yaml index d079111e..7d45b984 100644 --- a/.github/workflows/wheels-test.yaml +++ b/.github/workflows/wheels-test.yaml @@ -42,7 +42,9 @@ on: type: string default: '' build_workflow_name: - description: 'Custom workflow file name (defaults to build.yaml) to download artifacts from for tests' + description: | + Name of a workflow file that produced artifacts to be downloaded in this run. + If not set (the default), artifact-handling scripts use RAPIDS-conventional defaults (like "build.yaml" when "build_type == nightly"). required: false type: string