From 431f618754a9a9e0e918724b4b0fee12a53ead48 Mon Sep 17 00:00:00 2001 From: Ray Douglass Date: Fri, 19 May 2023 09:49:34 -0400 Subject: [PATCH 1/6] DOC --- .github/workflows/checks.yaml | 4 ++-- .github/workflows/custom-job.yaml | 2 +- .github/workflows/wheels-manylinux-build.yml | 4 ++-- .github/workflows/wheels-manylinux-publish.yml | 2 +- .github/workflows/wheels-manylinux-test.yml | 4 ++-- .github/workflows/wheels-pure-build.yml | 4 ++-- .github/workflows/wheels-pure-publish.yml | 2 +- .github/workflows/wheels-pure-test.yml | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index 06d53a6f..b725a33f 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -39,7 +39,7 @@ jobs: uses: actions/checkout@v3 - name: Get PR Info id: get-pr-info - uses: rapidsai/shared-action-workflows/get-pr-info@branch-23.06 + uses: rapidsai/shared-action-workflows/get-pr-info@branch-23.08 - name: Run rapids-size-checker if: ${{ inputs.enable_check_size }} run: rapids-size-checker @@ -60,7 +60,7 @@ jobs: fetch-depth: 0 - name: Get PR Info id: get-pr-info - uses: rapidsai/shared-action-workflows/get-pr-info@branch-23.06 + uses: rapidsai/shared-action-workflows/get-pr-info@branch-23.08 - uses: actions/cache@v3 with: path: ~/.cache/pre-commit diff --git a/.github/workflows/custom-job.yaml b/.github/workflows/custom-job.yaml index 8efb2c02..0779c8cd 100644 --- a/.github/workflows/custom-job.yaml +++ b/.github/workflows/custom-job.yaml @@ -69,7 +69,7 @@ jobs: - name: Get PR Info if: startsWith(github.ref_name, 'pull-request/') id: get-pr-info - uses: rapidsai/shared-action-workflows/get-pr-info@branch-23.06 + uses: rapidsai/shared-action-workflows/get-pr-info@branch-23.08 - name: Add PR Info if: startsWith(github.ref_name, 'pull-request/') run: | diff --git a/.github/workflows/wheels-manylinux-build.yml b/.github/workflows/wheels-manylinux-build.yml index 7be51ed3..94ec3a03 100644 --- a/.github/workflows/wheels-manylinux-build.yml +++ b/.github/workflows/wheels-manylinux-build.yml @@ -158,7 +158,7 @@ jobs: persist-credentials: false - name: Standardize repository information - uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.06 + uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.08 with: repo: ${{ inputs.repo }} branch: ${{ inputs.branch }} @@ -183,7 +183,7 @@ jobs: persist-credentials: false - name: Set CTK-related vars from input CTK versions - uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.06 + uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.08 with: ctk: ${{ matrix.ctk }} package-name: ${{ inputs.package-name }} diff --git a/.github/workflows/wheels-manylinux-publish.yml b/.github/workflows/wheels-manylinux-publish.yml index b6722d8e..8e370228 100644 --- a/.github/workflows/wheels-manylinux-publish.yml +++ b/.github/workflows/wheels-manylinux-publish.yml @@ -64,7 +64,7 @@ jobs: persist-credentials: false - name: Standardize repository information - uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.06 + uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.08 with: repo: ${{ inputs.repo }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/wheels-manylinux-test.yml b/.github/workflows/wheels-manylinux-test.yml index 66149538..275c80e1 100644 --- a/.github/workflows/wheels-manylinux-test.yml +++ b/.github/workflows/wheels-manylinux-test.yml @@ -149,7 +149,7 @@ jobs: persist-credentials: false - name: Standardize repository information - uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.06 + uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.08 with: repo: ${{ inputs.repo }} branch: ${{ inputs.branch }} @@ -157,7 +157,7 @@ jobs: sha: ${{ inputs.sha }} - name: Set CTK-related vars from input CTK versions - uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.06 + uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.08 with: ctk: ${{ matrix.ctk }} package-name: ${{ inputs.package-name }} diff --git a/.github/workflows/wheels-pure-build.yml b/.github/workflows/wheels-pure-build.yml index 88957b7b..3297dfc7 100644 --- a/.github/workflows/wheels-pure-build.yml +++ b/.github/workflows/wheels-pure-build.yml @@ -89,7 +89,7 @@ jobs: persist-credentials: false - name: Standardize repository information - uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.06 + uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.08 with: repo: ${{ inputs.repo }} branch: ${{ inputs.branch }} @@ -97,7 +97,7 @@ jobs: sha: ${{ inputs.sha }} - name: Set CTK-related vars from input CTK versions - uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.06 + uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.08 with: ctk: ${{ matrix.ctk }} package-name: ${{ inputs.package-name }} diff --git a/.github/workflows/wheels-pure-publish.yml b/.github/workflows/wheels-pure-publish.yml index 089b4326..5ad63fe1 100644 --- a/.github/workflows/wheels-pure-publish.yml +++ b/.github/workflows/wheels-pure-publish.yml @@ -68,7 +68,7 @@ jobs: persist-credentials: false - name: Standardize repository information - uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.06 + uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.08 with: repo: ${{ inputs.repo }} branch: ${{ inputs.branch }} diff --git a/.github/workflows/wheels-pure-test.yml b/.github/workflows/wheels-pure-test.yml index 02b53a01..64fe21d9 100644 --- a/.github/workflows/wheels-pure-test.yml +++ b/.github/workflows/wheels-pure-test.yml @@ -85,7 +85,7 @@ jobs: persist-credentials: false - name: Standardize repository information - uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.06 + uses: rapidsai/shared-action-workflows/rapids-github-info@branch-23.08 with: repo: ${{ inputs.repo }} branch: ${{ inputs.branch }} @@ -93,7 +93,7 @@ jobs: sha: ${{ inputs.sha }} - name: Set CTK-related vars from input CTK versions - uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.06 + uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.08 with: ctk: ${{ matrix.ctk }} package-name: ${{ inputs.package-name }} From 1911999ad14612b5ea32b067b021f9a2550b3e98 Mon Sep 17 00:00:00 2001 From: Divye Gala Date: Tue, 23 May 2023 14:53:40 -0400 Subject: [PATCH 2/6] `wheel-ctk-name-gen` part of `gha-tools` (#91) Relies on https://github.com/rapidsai/gha-tools/pull/55 Closes https://github.com/rapidsai/shared-action-workflows/issues/77 --------- Co-authored-by: Vyas Ramasubramani --- .github/workflows/wheels-manylinux-build.yml | 25 ++++++++----------- .github/workflows/wheels-manylinux-test.yml | 14 +++++------ .github/workflows/wheels-pure-build.yml | 23 +++++++---------- .github/workflows/wheels-pure-test.yml | 16 ++++++------ wheel-ctk-name-gen/README.md | 7 ------ wheel-ctk-name-gen/action.yml | 26 -------------------- 6 files changed, 32 insertions(+), 79 deletions(-) delete mode 100644 wheel-ctk-name-gen/README.md delete mode 100644 wheel-ctk-name-gen/action.yml diff --git a/.github/workflows/wheels-manylinux-build.yml b/.github/workflows/wheels-manylinux-build.yml index 94ec3a03..d670794e 100644 --- a/.github/workflows/wheels-manylinux-build.yml +++ b/.github/workflows/wheels-manylinux-build.yml @@ -182,31 +182,24 @@ jobs: ssh-key: ${{ secrets[inputs.extra-repo-deploy-key] }} persist-credentials: false - - name: Set CTK-related vars from input CTK versions - uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.08 - with: - ctk: ${{ matrix.ctk }} - package-name: ${{ inputs.package-name }} - - - name: Apply wheel modifications + - name: Build and repair the wheel run: | # Use gha-tools rapids-pip-wheel-version to generate wheel version then # update the necessary files versioneer_override="$(rapids-pip-wheel-version ${{ needs.wheel-epoch-timestamp.outputs.rapids_epoch_timestamp }})" - bash ci/release/apply_wheel_modifications.sh ${versioneer_override} ${{ env.RAPIDS_PY_WHEEL_CUDA_SUFFIX }} + PIP_CU_VERSION="$(rapids-wheel-ctk-name-gen ${{ matrix.ctk }})" + + bash ci/release/apply_wheel_modifications.sh ${versioneer_override} "-${PIP_CU_VERSION}" echo "The package name and/or version was modified in the package source. The git diff is:" git diff - - name: Build and repair the wheel - run: | pyenv global ${{ matrix.python }} # Run before-wheel command - # This variable needs to be used as an un-evaluated string by downstream libraries + # The variable $PIP_CU_VERSION needs to be used as an unevaluated string by downstream libraries # to support pulling wheels built from a previous workflow for different # CUDA versions - PIP_CU_VERSION=$(echo ${{ env.RAPIDS_PY_WHEEL_CUDA_SUFFIX }} | sed "s/-//") ${{ inputs.before-wheel }} cd "${{ inputs.package-dir }}" @@ -254,8 +247,10 @@ jobs: cd .. mkdir final_dist mv dist/${{ inputs.package-name }}*manylinux* final_dist + + # rapids-upload-wheels-to-s3 uses rapids-package-name which implicitly relies + # on this variable being set + export RAPIDS_PY_WHEEL_NAME="${{ inputs.package-name }}_${PIP_CU_VERSION}" + rapids-upload-wheels-to-s3 final_dist # Use a shell that loads the rc file so that we get the compiler settings shell: bash -leo pipefail {0} - - - name: Upload wheels to downloads.rapids.ai - run: rapids-upload-wheels-to-s3 "${{ inputs.package-dir }}"/final_dist diff --git a/.github/workflows/wheels-manylinux-test.yml b/.github/workflows/wheels-manylinux-test.yml index ace5a5b7..b6f9ec58 100644 --- a/.github/workflows/wheels-manylinux-test.yml +++ b/.github/workflows/wheels-manylinux-test.yml @@ -155,20 +155,18 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} - - name: Set CTK-related vars from input CTK versions - uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.08 - with: - ctk: ${{ matrix.ctk }} - package-name: ${{ inputs.package-name }} - - name: Run citestwheel run: | - # This variable needs to be used as an un-evaluated string by downstream libraries + PIP_CU_VERSION="$(rapids-wheel-ctk-name-gen ${{ matrix.ctk }})" + + # The variable PIP_CU_VERSION needs to be used as an unevaluated string by downstream libraries # to support pulling wheels built from a previous workflow for different # CUDA versions - PIP_CU_VERSION=$(echo ${{ env.RAPIDS_PY_WHEEL_CUDA_SUFFIX }} | sed "s/-//") export RAPIDS_BEFORE_TEST_COMMANDS_AMD64="${{ inputs.test-before-amd64 }}" export RAPIDS_BEFORE_TEST_COMMANDS_ARM64="${{ inputs.test-before-arm64 }}" + # citestwheel.sh implicitly uses this to download previously built wheels + export RAPIDS_PY_WHEEL_NAME="${{ inputs.package-name }}_${PIP_CU_VERSION}" + /citestwheel.sh diff --git a/.github/workflows/wheels-pure-build.yml b/.github/workflows/wheels-pure-build.yml index 3297dfc7..8f7723e3 100644 --- a/.github/workflows/wheels-pure-build.yml +++ b/.github/workflows/wheels-pure-build.yml @@ -96,30 +96,25 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} - - name: Set CTK-related vars from input CTK versions - uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.08 - with: - ctk: ${{ matrix.ctk }} - package-name: ${{ inputs.package-name }} - - - name: Run before-wheel command + - name: Build pure python wheel with pip wheel run: | - # This variable needs to be used as an un-evaluated string by downstream libraries + PIP_CU_VERSION="$(rapids-wheel-ctk-name-gen ${{ matrix.ctk }})" + + # The variable PIP_CU_VERSION needs to be used as an unevaluated string by downstream libraries # to support pulling wheels built from a previous workflow for different # CUDA versions - PIP_CU_VERSION=$(echo ${RAPIDS_PY_WHEEL_CUDA_SUFFIX} | sed "s/-//") ${{ inputs.before-wheel }} - - name: Build pure python wheel with pip wheel - run: | versioneer_override="$(rapids-pip-wheel-version ${{ needs.wheel-epoch-timestamp.outputs.rapids_epoch_timestamp }})" - bash ci/release/apply_wheel_modifications.sh ${versioneer_override} ${RAPIDS_PY_WHEEL_CUDA_SUFFIX} + bash ci/release/apply_wheel_modifications.sh ${versioneer_override} "-${PIP_CU_VERSION}" echo "The package name and/or version was modified in the package source. The git diff is:" git diff python -m pip wheel -w ./dist ${{ inputs.package-dir }} --no-deps -vvv - - name: Upload wheels to downloads.rapids.ai - run: rapids-upload-wheels-to-s3 dist + # rapids-upload-wheels-to-s3 uses rapids-package-name which implicitly relies + # on this variable being set + export RAPIDS_PY_WHEEL_NAME="${{ inputs.package-name }}_${PIP_CU_VERSION}" + rapids-upload-wheels-to-s3 dist diff --git a/.github/workflows/wheels-pure-test.yml b/.github/workflows/wheels-pure-test.yml index 64fe21d9..a08fd03b 100644 --- a/.github/workflows/wheels-pure-test.yml +++ b/.github/workflows/wheels-pure-test.yml @@ -92,19 +92,17 @@ jobs: date: ${{ inputs.date }} sha: ${{ inputs.sha }} - - name: Set CTK-related vars from input CTK versions - uses: rapidsai/shared-action-workflows/wheel-ctk-name-gen@branch-23.08 - with: - ctk: ${{ matrix.ctk }} - package-name: ${{ inputs.package-name }} - - name: Run citestwheel run: | - # This variable needs to be used as an un-evaluated string by downstream libraries + PIP_CU_VERSION="$(rapids-wheel-ctk-name-gen ${{ matrix.ctk }})" + + # The variable PIP_CU_VERSION needs to be used as an unevaluated string by downstream libraries # to support pulling wheels built from a previous workflow for different # CUDA versions - PIP_CU_VERSION=$(echo ${RAPIDS_PY_WHEEL_CUDA_SUFFIX} | sed "s/-//") - + export RAPIDS_BEFORE_TEST_COMMANDS_AMD64="${{ inputs.test-before }}" + # citestwheel.sh implicitly uses this to download previously built wheels + export RAPIDS_PY_WHEEL_NAME="${{ inputs.package-name }}_${PIP_CU_VERSION}" + /citestwheel.sh diff --git a/wheel-ctk-name-gen/README.md b/wheel-ctk-name-gen/README.md deleted file mode 100644 index 5f1478c4..00000000 --- a/wheel-ctk-name-gen/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# wheel-ctk-name-gen - -This composite action is intended to be used in pip wheel workflows, to massage a CTK version 'AA.B.C' into the following: -* `RAPIDS_PY_WHEEL_CUDA_SUFFIX=-cuAA` -* `RAPIDS_PY_WHEEL_NAME=${{ inputs.package-name }}+ - -It will take the input repo/branch/date/sha and pass it through if they are set (by an external repo) or use `github.` variables if they are unset (running from the source repo itself). diff --git a/wheel-ctk-name-gen/action.yml b/wheel-ctk-name-gen/action.yml deleted file mode 100644 index fc0f3a85..00000000 --- a/wheel-ctk-name-gen/action.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: "Wheel CTK name generator" -inputs: - ctk: - type: string - package-name: - type: string -outputs: - rapids_py_cuda_suffix: - value: ${{ steps.ctk-gen.outputs.RAPIDS_PY_WHEEL_CUDA_SUFFIX }} - rapids_py_wheel_name: - value: ${{ steps.ctk-gen.outputs.RAPIDS_PY_WHEEL_NAME }} - -runs: - using: composite - steps: - - name: Set CTK-related vars from input CTK versions - id: ctk-gen - shell: bash - run: | - ctk_tag="${{ inputs.ctk }}" - ctk_major=$(echo $ctk_tag | cut -d'.' -f1) - cuda_suffix="-cu${ctk_major}" - wheelname="${{ inputs.package-name }}_cu${ctk_major}" - - echo "RAPIDS_PY_WHEEL_CUDA_SUFFIX=${cuda_suffix}" | tee --append "${GITHUB_ENV}" "${GITHUB_OUTPUT}" - echo "RAPIDS_PY_WHEEL_NAME=${wheelname}" | tee --append "${GITHUB_ENV}" "${GITHUB_OUTPUT}" From bcf5b52ea7260732354d2a1f189a8eb4b0f37518 Mon Sep 17 00:00:00 2001 From: Divye Gala Date: Tue, 23 May 2023 18:58:26 -0400 Subject: [PATCH 3/6] Remove aws credentials from wheel build workflow (#96) Closes https://github.com/rapidsai/shared-action-workflows/issues/83 --- .github/workflows/conda-cpp-build.yaml | 2 +- .github/workflows/conda-cpp-tests.yaml | 2 +- .github/workflows/conda-python-build.yaml | 2 +- .github/workflows/conda-python-tests.yaml | 2 +- .github/workflows/conda-upload-packages.yaml | 2 +- .github/workflows/custom-job.yaml | 2 +- .github/workflows/wheels-manylinux-build.yml | 5 +---- .github/workflows/wheels-manylinux-publish.yml | 2 +- .github/workflows/wheels-manylinux-test.yml | 2 +- .github/workflows/wheels-pure-build.yml | 2 +- .github/workflows/wheels-pure-publish.yml | 2 +- .github/workflows/wheels-pure-test.yml | 2 +- 12 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/conda-cpp-build.yaml b/.github/workflows/conda-cpp-build.yaml index 11fb303a..c8e57c16 100644 --- a/.github/workflows/conda-cpp-build.yaml +++ b/.github/workflows/conda-cpp-build.yaml @@ -76,7 +76,7 @@ jobs: RAPIDS_BUILD_TYPE: ${{ inputs.build_type }} PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-cpp-tests.yaml b/.github/workflows/conda-cpp-tests.yaml index a24c5a4d..b839e0af 100644 --- a/.github/workflows/conda-cpp-tests.yaml +++ b/.github/workflows/conda-cpp-tests.yaml @@ -110,7 +110,7 @@ jobs: PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-python-build.yaml b/.github/workflows/conda-python-build.yaml index 9ee369c2..32c59768 100644 --- a/.github/workflows/conda-python-build.yaml +++ b/.github/workflows/conda-python-build.yaml @@ -77,7 +77,7 @@ jobs: RAPIDS_BUILD_TYPE: ${{ inputs.build_type }} PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-python-tests.yaml b/.github/workflows/conda-python-tests.yaml index 1c3640ec..89d41276 100644 --- a/.github/workflows/conda-python-tests.yaml +++ b/.github/workflows/conda-python-tests.yaml @@ -114,7 +114,7 @@ jobs: PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-upload-packages.yaml b/.github/workflows/conda-upload-packages.yaml index 2f4f4ae8..148aa3b8 100644 --- a/.github/workflows/conda-upload-packages.yaml +++ b/.github/workflows/conda-upload-packages.yaml @@ -46,7 +46,7 @@ jobs: env: RAPIDS_BUILD_TYPE: ${{ inputs.build_type }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/custom-job.yaml b/.github/workflows/custom-job.yaml index 0779c8cd..18c08eb9 100644 --- a/.github/workflows/custom-job.yaml +++ b/.github/workflows/custom-job.yaml @@ -56,7 +56,7 @@ jobs: PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-manylinux-build.yml b/.github/workflows/wheels-manylinux-build.yml index d670794e..8be9274b 100644 --- a/.github/workflows/wheels-manylinux-build.yml +++ b/.github/workflows/wheels-manylinux-build.yml @@ -144,7 +144,7 @@ jobs: RAPIDS_PY_VERSION: ${{ matrix.python }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} @@ -210,9 +210,6 @@ jobs: export SCCACHE_IDLE_TIMEOUT=32768 export SCCACHE_BUCKET=rapids-sccache-east export SCCACHE_S3_USE_SSL=true - export AWS_ACCESS_KEY_ID=${{ env.AWS_ACCESS_KEY_ID }} - export AWS_SECRET_ACCESS_KEY=${{ env.AWS_SECRET_ACCESS_KEY }} - export AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }} # Set up skbuild options. Enable sccache in skbuild config options export SKBUILD_CONFIGURE_OPTIONS="${{ inputs.skbuild-configure-options}} -DCMAKE_C_COMPILER_LAUNCHER=/usr/bin/sccache -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/bin/sccache -DCMAKE_CUDA_COMPILER_LAUNCHER=/usr/bin/sccache" diff --git a/.github/workflows/wheels-manylinux-publish.yml b/.github/workflows/wheels-manylinux-publish.yml index 8e370228..d4a45ee8 100644 --- a/.github/workflows/wheels-manylinux-publish.yml +++ b/.github/workflows/wheels-manylinux-publish.yml @@ -50,7 +50,7 @@ jobs: TWINE_PASSWORD: ${{ secrets.RAPIDSAI_PYPI_CI_PASSWORD }} TWINE_REPOSITORY_URL: "https://pypi.k8s.rapids.ai/simple/" steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-manylinux-test.yml b/.github/workflows/wheels-manylinux-test.yml index b6f9ec58..4379cd3d 100644 --- a/.github/workflows/wheels-manylinux-test.yml +++ b/.github/workflows/wheels-manylinux-test.yml @@ -128,7 +128,7 @@ jobs: CIBW_TEST_EXTRAS: "test" CIBW_TEST_COMMAND: ${{ matrix.test-command }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-pure-build.yml b/.github/workflows/wheels-pure-build.yml index 8f7723e3..e929e7b7 100644 --- a/.github/workflows/wheels-pure-build.yml +++ b/.github/workflows/wheels-pure-build.yml @@ -75,7 +75,7 @@ jobs: RAPIDS_PY_VERSION: "3.10" steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-pure-publish.yml b/.github/workflows/wheels-pure-publish.yml index 5ad63fe1..69214010 100644 --- a/.github/workflows/wheels-pure-publish.yml +++ b/.github/workflows/wheels-pure-publish.yml @@ -54,7 +54,7 @@ jobs: TWINE_PASSWORD: ${{ secrets.RAPIDSAI_PYPI_CI_PASSWORD }} TWINE_REPOSITORY_URL: "https://pypi.k8s.rapids.ai/simple/" steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-pure-test.yml b/.github/workflows/wheels-pure-test.yml index a08fd03b..bf8046ed 100644 --- a/.github/workflows/wheels-pure-test.yml +++ b/.github/workflows/wheels-pure-test.yml @@ -65,7 +65,7 @@ jobs: CIBW_TEST_COMMAND: ${{ inputs.test-unittest }} PIP_EXTRA_INDEX_URL: "https://pypi.k8s.rapids.ai/simple" steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} From 9647ea3166c24dd6c6d41b589cb2d83635e1f600 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 23 May 2023 17:42:39 -0700 Subject: [PATCH 4/6] Revert "Remove aws credentials from wheel build workflow" (#98) Reverts rapidsai/shared-action-workflows#96 Based on https://github.com/rapidsai/cudf/pull/13422, we are seeing sccache misses so we're going to merge these changes into #94 to figure out what is responsible for the cache misses. --- .github/workflows/conda-cpp-build.yaml | 2 +- .github/workflows/conda-cpp-tests.yaml | 2 +- .github/workflows/conda-python-build.yaml | 2 +- .github/workflows/conda-python-tests.yaml | 2 +- .github/workflows/conda-upload-packages.yaml | 2 +- .github/workflows/custom-job.yaml | 2 +- .github/workflows/wheels-manylinux-build.yml | 5 ++++- .github/workflows/wheels-manylinux-publish.yml | 2 +- .github/workflows/wheels-manylinux-test.yml | 2 +- .github/workflows/wheels-pure-build.yml | 2 +- .github/workflows/wheels-pure-publish.yml | 2 +- .github/workflows/wheels-pure-test.yml | 2 +- 12 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/conda-cpp-build.yaml b/.github/workflows/conda-cpp-build.yaml index c8e57c16..11fb303a 100644 --- a/.github/workflows/conda-cpp-build.yaml +++ b/.github/workflows/conda-cpp-build.yaml @@ -76,7 +76,7 @@ jobs: RAPIDS_BUILD_TYPE: ${{ inputs.build_type }} PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-cpp-tests.yaml b/.github/workflows/conda-cpp-tests.yaml index b839e0af..a24c5a4d 100644 --- a/.github/workflows/conda-cpp-tests.yaml +++ b/.github/workflows/conda-cpp-tests.yaml @@ -110,7 +110,7 @@ jobs: PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }} steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-python-build.yaml b/.github/workflows/conda-python-build.yaml index 32c59768..9ee369c2 100644 --- a/.github/workflows/conda-python-build.yaml +++ b/.github/workflows/conda-python-build.yaml @@ -77,7 +77,7 @@ jobs: RAPIDS_BUILD_TYPE: ${{ inputs.build_type }} PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-python-tests.yaml b/.github/workflows/conda-python-tests.yaml index 89d41276..1c3640ec 100644 --- a/.github/workflows/conda-python-tests.yaml +++ b/.github/workflows/conda-python-tests.yaml @@ -114,7 +114,7 @@ jobs: PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }} steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-upload-packages.yaml b/.github/workflows/conda-upload-packages.yaml index 148aa3b8..2f4f4ae8 100644 --- a/.github/workflows/conda-upload-packages.yaml +++ b/.github/workflows/conda-upload-packages.yaml @@ -46,7 +46,7 @@ jobs: env: RAPIDS_BUILD_TYPE: ${{ inputs.build_type }} steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/custom-job.yaml b/.github/workflows/custom-job.yaml index 18c08eb9..0779c8cd 100644 --- a/.github/workflows/custom-job.yaml +++ b/.github/workflows/custom-job.yaml @@ -56,7 +56,7 @@ jobs: PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }} steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-manylinux-build.yml b/.github/workflows/wheels-manylinux-build.yml index 8be9274b..d670794e 100644 --- a/.github/workflows/wheels-manylinux-build.yml +++ b/.github/workflows/wheels-manylinux-build.yml @@ -144,7 +144,7 @@ jobs: RAPIDS_PY_VERSION: ${{ matrix.python }} steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} @@ -210,6 +210,9 @@ jobs: export SCCACHE_IDLE_TIMEOUT=32768 export SCCACHE_BUCKET=rapids-sccache-east export SCCACHE_S3_USE_SSL=true + export AWS_ACCESS_KEY_ID=${{ env.AWS_ACCESS_KEY_ID }} + export AWS_SECRET_ACCESS_KEY=${{ env.AWS_SECRET_ACCESS_KEY }} + export AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }} # Set up skbuild options. Enable sccache in skbuild config options export SKBUILD_CONFIGURE_OPTIONS="${{ inputs.skbuild-configure-options}} -DCMAKE_C_COMPILER_LAUNCHER=/usr/bin/sccache -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/bin/sccache -DCMAKE_CUDA_COMPILER_LAUNCHER=/usr/bin/sccache" diff --git a/.github/workflows/wheels-manylinux-publish.yml b/.github/workflows/wheels-manylinux-publish.yml index d4a45ee8..8e370228 100644 --- a/.github/workflows/wheels-manylinux-publish.yml +++ b/.github/workflows/wheels-manylinux-publish.yml @@ -50,7 +50,7 @@ jobs: TWINE_PASSWORD: ${{ secrets.RAPIDSAI_PYPI_CI_PASSWORD }} TWINE_REPOSITORY_URL: "https://pypi.k8s.rapids.ai/simple/" steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-manylinux-test.yml b/.github/workflows/wheels-manylinux-test.yml index 4379cd3d..b6f9ec58 100644 --- a/.github/workflows/wheels-manylinux-test.yml +++ b/.github/workflows/wheels-manylinux-test.yml @@ -128,7 +128,7 @@ jobs: CIBW_TEST_EXTRAS: "test" CIBW_TEST_COMMAND: ${{ matrix.test-command }} steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-pure-build.yml b/.github/workflows/wheels-pure-build.yml index e929e7b7..8f7723e3 100644 --- a/.github/workflows/wheels-pure-build.yml +++ b/.github/workflows/wheels-pure-build.yml @@ -75,7 +75,7 @@ jobs: RAPIDS_PY_VERSION: "3.10" steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-pure-publish.yml b/.github/workflows/wheels-pure-publish.yml index 69214010..5ad63fe1 100644 --- a/.github/workflows/wheels-pure-publish.yml +++ b/.github/workflows/wheels-pure-publish.yml @@ -54,7 +54,7 @@ jobs: TWINE_PASSWORD: ${{ secrets.RAPIDSAI_PYPI_CI_PASSWORD }} TWINE_REPOSITORY_URL: "https://pypi.k8s.rapids.ai/simple/" steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-pure-test.yml b/.github/workflows/wheels-pure-test.yml index bf8046ed..a08fd03b 100644 --- a/.github/workflows/wheels-pure-test.yml +++ b/.github/workflows/wheels-pure-test.yml @@ -65,7 +65,7 @@ jobs: CIBW_TEST_COMMAND: ${{ inputs.test-unittest }} PIP_EXTRA_INDEX_URL: "https://pypi.k8s.rapids.ai/simple" steps: - - uses: aws-actions/configure-aws-credentials@v2 + - uses: aws-actions/configure-aws-credentials@v1-node16 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} From 4612ccc09d41e754ffdbb5ac5052072119847c12 Mon Sep 17 00:00:00 2001 From: Divye Gala Date: Wed, 24 May 2023 09:10:34 -0400 Subject: [PATCH 5/6] Remove `sccache` config from wheel building workflow (#94) Depends on https://github.com/rapidsai/cibuildwheel-imgs/pull/21 Resolves #82 --- .github/workflows/conda-cpp-build.yaml | 2 +- .github/workflows/conda-cpp-tests.yaml | 2 +- .github/workflows/conda-python-build.yaml | 2 +- .github/workflows/conda-python-tests.yaml | 2 +- .github/workflows/conda-upload-packages.yaml | 2 +- .github/workflows/custom-job.yaml | 2 +- .github/workflows/wheels-manylinux-build.yml | 14 ++------------ .github/workflows/wheels-manylinux-publish.yml | 2 +- .github/workflows/wheels-manylinux-test.yml | 2 +- .github/workflows/wheels-pure-build.yml | 2 +- .github/workflows/wheels-pure-publish.yml | 2 +- .github/workflows/wheels-pure-test.yml | 2 +- 12 files changed, 13 insertions(+), 23 deletions(-) diff --git a/.github/workflows/conda-cpp-build.yaml b/.github/workflows/conda-cpp-build.yaml index 11fb303a..c8e57c16 100644 --- a/.github/workflows/conda-cpp-build.yaml +++ b/.github/workflows/conda-cpp-build.yaml @@ -76,7 +76,7 @@ jobs: RAPIDS_BUILD_TYPE: ${{ inputs.build_type }} PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-cpp-tests.yaml b/.github/workflows/conda-cpp-tests.yaml index a24c5a4d..b839e0af 100644 --- a/.github/workflows/conda-cpp-tests.yaml +++ b/.github/workflows/conda-cpp-tests.yaml @@ -110,7 +110,7 @@ jobs: PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-python-build.yaml b/.github/workflows/conda-python-build.yaml index 9ee369c2..32c59768 100644 --- a/.github/workflows/conda-python-build.yaml +++ b/.github/workflows/conda-python-build.yaml @@ -77,7 +77,7 @@ jobs: RAPIDS_BUILD_TYPE: ${{ inputs.build_type }} PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-python-tests.yaml b/.github/workflows/conda-python-tests.yaml index 1c3640ec..89d41276 100644 --- a/.github/workflows/conda-python-tests.yaml +++ b/.github/workflows/conda-python-tests.yaml @@ -114,7 +114,7 @@ jobs: PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/conda-upload-packages.yaml b/.github/workflows/conda-upload-packages.yaml index 2f4f4ae8..148aa3b8 100644 --- a/.github/workflows/conda-upload-packages.yaml +++ b/.github/workflows/conda-upload-packages.yaml @@ -46,7 +46,7 @@ jobs: env: RAPIDS_BUILD_TYPE: ${{ inputs.build_type }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/custom-job.yaml b/.github/workflows/custom-job.yaml index 0779c8cd..18c08eb9 100644 --- a/.github/workflows/custom-job.yaml +++ b/.github/workflows/custom-job.yaml @@ -56,7 +56,7 @@ jobs: PARALLEL_LEVEL: ${{ env.PARALLEL_LEVEL }} NVIDIA_VISIBLE_DEVICES: ${{ env.NVIDIA_VISIBLE_DEVICES }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-manylinux-build.yml b/.github/workflows/wheels-manylinux-build.yml index d670794e..7b6613ce 100644 --- a/.github/workflows/wheels-manylinux-build.yml +++ b/.github/workflows/wheels-manylinux-build.yml @@ -144,7 +144,7 @@ jobs: RAPIDS_PY_VERSION: ${{ matrix.python }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} @@ -204,18 +204,8 @@ jobs: cd "${{ inputs.package-dir }}" - # sccache configuration - export SCCACHE_S3_KEY_PREFIX=gha-cibw - export SCCACHE_REGION=us-east-2 - export SCCACHE_IDLE_TIMEOUT=32768 - export SCCACHE_BUCKET=rapids-sccache-east - export SCCACHE_S3_USE_SSL=true - export AWS_ACCESS_KEY_ID=${{ env.AWS_ACCESS_KEY_ID }} - export AWS_SECRET_ACCESS_KEY=${{ env.AWS_SECRET_ACCESS_KEY }} - export AWS_SESSION_TOKEN=${{ env.AWS_SESSION_TOKEN }} - # Set up skbuild options. Enable sccache in skbuild config options - export SKBUILD_CONFIGURE_OPTIONS="${{ inputs.skbuild-configure-options}} -DCMAKE_C_COMPILER_LAUNCHER=/usr/bin/sccache -DCMAKE_CXX_COMPILER_LAUNCHER=/usr/bin/sccache -DCMAKE_CUDA_COMPILER_LAUNCHER=/usr/bin/sccache" + export SKBUILD_CONFIGURE_OPTIONS="${{ inputs.skbuild-configure-options}}" export SKBUILD_BUILD_OPTIONS="${{ inputs.skbuild-build-options }}" # Set up for pip installation of dependencies from the nightly index diff --git a/.github/workflows/wheels-manylinux-publish.yml b/.github/workflows/wheels-manylinux-publish.yml index 8e370228..d4a45ee8 100644 --- a/.github/workflows/wheels-manylinux-publish.yml +++ b/.github/workflows/wheels-manylinux-publish.yml @@ -50,7 +50,7 @@ jobs: TWINE_PASSWORD: ${{ secrets.RAPIDSAI_PYPI_CI_PASSWORD }} TWINE_REPOSITORY_URL: "https://pypi.k8s.rapids.ai/simple/" steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-manylinux-test.yml b/.github/workflows/wheels-manylinux-test.yml index b6f9ec58..4379cd3d 100644 --- a/.github/workflows/wheels-manylinux-test.yml +++ b/.github/workflows/wheels-manylinux-test.yml @@ -128,7 +128,7 @@ jobs: CIBW_TEST_EXTRAS: "test" CIBW_TEST_COMMAND: ${{ matrix.test-command }} steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-pure-build.yml b/.github/workflows/wheels-pure-build.yml index 8f7723e3..e929e7b7 100644 --- a/.github/workflows/wheels-pure-build.yml +++ b/.github/workflows/wheels-pure-build.yml @@ -75,7 +75,7 @@ jobs: RAPIDS_PY_VERSION: "3.10" steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-pure-publish.yml b/.github/workflows/wheels-pure-publish.yml index 5ad63fe1..69214010 100644 --- a/.github/workflows/wheels-pure-publish.yml +++ b/.github/workflows/wheels-pure-publish.yml @@ -54,7 +54,7 @@ jobs: TWINE_PASSWORD: ${{ secrets.RAPIDSAI_PYPI_CI_PASSWORD }} TWINE_REPOSITORY_URL: "https://pypi.k8s.rapids.ai/simple/" steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} diff --git a/.github/workflows/wheels-pure-test.yml b/.github/workflows/wheels-pure-test.yml index a08fd03b..bf8046ed 100644 --- a/.github/workflows/wheels-pure-test.yml +++ b/.github/workflows/wheels-pure-test.yml @@ -65,7 +65,7 @@ jobs: CIBW_TEST_COMMAND: ${{ inputs.test-unittest }} PIP_EXTRA_INDEX_URL: "https://pypi.k8s.rapids.ai/simple" steps: - - uses: aws-actions/configure-aws-credentials@v1-node16 + - uses: aws-actions/configure-aws-credentials@v2 with: role-to-assume: ${{ vars.AWS_ROLE_ARN }} aws-region: ${{ vars.AWS_REGION }} From fce1bcb6a974572d30221df37dcefbb691521124 Mon Sep 17 00:00:00 2001 From: Rick Ratzel <3039903+rlratzel@users.noreply.github.com> Date: Wed, 24 May 2023 10:03:24 -0500 Subject: [PATCH 6/6] Removes `auditwheel` `--plat` arg in favor of using `AUDITWHEEL_PLAT` env var in image (#99) closes #80 Merge after rapidsai/cibuildwheel-imgs#20 --- .github/workflows/wheels-manylinux-build.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/wheels-manylinux-build.yml b/.github/workflows/wheels-manylinux-build.yml index 7b6613ce..959b3c83 100644 --- a/.github/workflows/wheels-manylinux-build.yml +++ b/.github/workflows/wheels-manylinux-build.yml @@ -220,11 +220,7 @@ jobs: # Repair the wheel cd dist - if [[ "${{ matrix.arch }}" == "amd64" ]]; then - python -m auditwheel repair -w . ${{ inputs.package-name }}* --plat manylinux_2_17_x86_64 - else - python -m auditwheel repair -w . ${{ inputs.package-name }}* --plat manylinux_2_31_aarch64 - fi + python -m auditwheel repair -w . ${{ inputs.package-name }}* if [[ "${{ matrix.arch }}" == "arm64" ]]; then ${{ inputs.post-repair-arm64 }}