Merge remote-tracking branch 'upstream/branch-25.06' into python-3.13

Author: bdice

.github/workflows/conda-cpp-build.yaml

@@ -19,6 +19,11 @@ on:
       script:
         type: string
         default: "ci/build_cpp.sh"
+      upload-artifacts:
+        type: boolean
+        default: true
+        required: false
+        description: "One of [true, false], true if artifacts should be uploaded to GitHub's artifact store"
       matrix_filter:
         type: string
         default: "."
@@ -125,15 +130,18 @@ jobs:
           STEP_NAME: "C++ build"
           GH_TOKEN: ${{ github.token }}
       - name: Get Package Name and Location
+        if: ${{ inputs.upload-artifacts }}
         run: | 
           echo "RAPIDS_PACKAGE_NAME=$(RAPIDS_NO_PKG_EXTENSION=true rapids-package-name conda_cpp)" >> "${GITHUB_OUTPUT}"
           echo "CONDA_OUTPUT_DIR=${RAPIDS_CONDA_BLD_OUTPUT_DIR}" >> "${GITHUB_OUTPUT}"
         id: package-name
       - name: Show files to be uploaded
+        if: ${{ inputs.upload-artifacts }}
         run: |
           echo "Contents of directory to be uploaded:"
           ls -R ${{ steps.package-name.outputs.CONDA_OUTPUT_DIR }}
       - uses: actions/upload-artifact@v4
+        if: ${{ inputs.upload-artifacts }}
         with:
           name: ${{ steps.package-name.outputs.RAPIDS_PACKAGE_NAME }}
           path: ${{ steps.package-name.outputs.CONDA_OUTPUT_DIR }}

.github/workflows/conda-python-build.yaml

@@ -19,6 +19,11 @@ on:
       script:
         type: string
         default: "ci/build_python.sh"
+      upload-artifacts:
+        type: boolean
+        default: true
+        required: false
+        description: "One of [true, false], true if artifacts should be uploaded to GitHub's artifact store"
       matrix_filter:
         type: string
         default: "."
@@ -129,15 +134,18 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
       - name: Get Package Name and Location
+        if: ${{ inputs.upload-artifacts }}
         run: | 
           echo "RAPIDS_PACKAGE_NAME=$(RAPIDS_NO_PKG_EXTENSION=true rapids-package-name conda_python)" >> "${GITHUB_OUTPUT}"
           echo "CONDA_OUTPUT_DIR=${RAPIDS_CONDA_BLD_OUTPUT_DIR}" >> "${GITHUB_OUTPUT}"
         id: package-name
       - name: Show files to be uploaded
+        if: ${{ inputs.upload-artifacts }}
         run: |
           echo "Contents of directory to be uploaded:"
           ls -R ${{ steps.package-name.outputs.CONDA_OUTPUT_DIR }}
       - uses: actions/upload-artifact@v4
+        if: ${{ inputs.upload-artifacts }}
         with:
           name: ${{ steps.package-name.outputs.RAPIDS_PACKAGE_NAME }}
           path: ${{ steps.package-name.outputs.CONDA_OUTPUT_DIR }}

.github/workflows/wheels-build.yaml

@@ -25,7 +25,7 @@ on:
         description: "Distribution name, without any other qualifiers (e.g. 'pylibcudf', not 'pylibcudf-cu12-cp311-manylinux_2_24_aarch64')"
       package-type:
         description: "One of: [cpp, python]"
-        required: false
+        required: true
         type: string
       wheel-name:
         required: false
@@ -52,6 +52,11 @@ on:
       matrix_filter:
         type: string
         default: "."
+      upload-artifacts:
+        type: boolean
+        default: true
+        required: false
+        description: "One of [true, false], true if artifacts should be uploaded to GitHub's artifact store"
 
       # Extra repository that will be cloned into the project directory.
       extra-repo:
@@ -204,7 +209,7 @@ jobs:
         shell: bash -leo pipefail {0}
 
       - name: Get package name
-        if: inputs.package-type != ''
+        if: ${{ inputs.upload-artifacts }}
         env:
           PACKAGE_TYPE: ${{ inputs.package-type }}
           WHEEL_NAME: ${{ inputs.package-name != '' && inputs.package-name || inputs.wheel-name }}
@@ -228,13 +233,13 @@ jobs:
         id: package-name
 
       - name: Show files to be uploaded
-        if: inputs.package-type != ''
+        if: ${{ inputs.upload-artifacts }}
         run: |
           echo "Contents of directory to be uploaded:"
           ls -R ${{ steps.package-name.outputs.WHEEL_OUTPUT_DIR }}
       
       - uses: actions/upload-artifact@v4
-        if: inputs.package-type != ''
+        if: ${{ inputs.upload-artifacts }}
         with:
           name: ${{ steps.package-name.outputs.RAPIDS_PACKAGE_NAME }}
           path: ${{ steps.package-name.outputs.WHEEL_OUTPUT_DIR }}