diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 9df8c1d11d..e55ba04fdb 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -33,5 +33,3 @@ sccache --show-adv-stats # remove build_cache directory rm -rf "$RAPIDS_CONDA_BLD_OUTPUT_DIR"/build_cache - -rapids-upload-conda-to-s3 cpp diff --git a/ci/build_python.sh b/ci/build_python.sh index efb4c1233c..78fc6f2bda 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -60,5 +60,3 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "12" ]]; then "${RATTLER_CHANNELS[@]}" sccache --show-adv-stats fi - -rapids-upload-conda-to-s3 python diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index cd31d05fdd..1d02bc0dd7 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -5,15 +5,11 @@ set -euo pipefail package_name=$1 package_dir=$2 -package_type=$3 -underscore_package_name=$(echo "${package_name}" | tr "-" "_") source rapids-configure-sccache source rapids-date-string source rapids-init-pip -RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" - rapids-generate-version > ./VERSION cd "${package_dir}" @@ -60,5 +56,3 @@ sccache --show-adv-stats # repair wheels and write to the location that artifact-uploading code expects to find them python -m auditwheel repair -w "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" "${EXCLUDE_ARGS[@]}" dist/* - -RAPIDS_PY_WHEEL_NAME="${underscore_package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-upload-wheels-to-s3 "${package_type}" "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" diff --git a/ci/build_wheel_cuvs.sh b/ci/build_wheel_cuvs.sh index e6d97d0abb..352a2238e8 100755 --- a/ci/build_wheel_cuvs.sh +++ b/ci/build_wheel_cuvs.sh @@ -17,5 +17,5 @@ RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen "${RAPIDS_CUDA_VERSION}")" LIBCUVS_WHEELHOUSE=$(RAPIDS_PY_WHEEL_NAME="libcuvs_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-github cpp) echo "libcuvs-${RAPIDS_PY_CUDA_SUFFIX} @ file://$(echo "${LIBCUVS_WHEELHOUSE}"/libcuvs_*.whl)" >> "${PIP_CONSTRAINT}" -ci/build_wheel.sh cuvs ${package_dir} python +ci/build_wheel.sh cuvs ${package_dir} ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}" diff --git a/ci/build_wheel_libcuvs.sh b/ci/build_wheel_libcuvs.sh index 6d80282ff5..8bd4467f93 100755 --- a/ci/build_wheel_libcuvs.sh +++ b/ci/build_wheel_libcuvs.sh @@ -28,5 +28,5 @@ rapids-pip-retry install \ # 0 really means "add --no-build-isolation" (ref: https://github.com/pypa/pip/issues/5735) export PIP_NO_BUILD_ISOLATION=0 -ci/build_wheel.sh libcuvs ${package_dir} cpp +ci/build_wheel.sh libcuvs ${package_dir} ci/validate_wheel.sh ${package_dir} "${RAPIDS_WHEEL_BLD_OUTPUT_DIR}"