Skip to content

Commit

Permalink
Merge branch 'main' into renovate_regex_manager
Browse files Browse the repository at this point in the history
  • Loading branch information
AyodeAwe authored Feb 26, 2024
2 parents 3dcae1a + 37a8b8b commit d005eb1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 23 deletions.
10 changes: 0 additions & 10 deletions ci-conda.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,6 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV RAPIDS_CUDA_VERSION="${CUDA_VER}"
ENV RAPIDS_PY_VERSION="${PYTHON_VER}"

# Add sccache/build variables
ENV CMAKE_CUDA_COMPILER_LAUNCHER=sccache
ENV CMAKE_CXX_COMPILER_LAUNCHER=sccache
ENV CMAKE_C_COMPILER_LAUNCHER=sccache
ENV SCCACHE_BUCKET=rapids-sccache-east
ENV SCCACHE_REGION=us-east-2
ENV SCCACHE_IDLE_TIMEOUT=32768
ENV SCCACHE_S3_USE_SSL=true
ENV SCCACHE_S3_NO_CREDENTIALS=false

SHELL ["/bin/bash", "-euo", "pipefail", "-c"]

# Install system packages depending on the LINUX_VER
Expand Down
11 changes: 1 addition & 10 deletions ci-wheel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -136,15 +136,6 @@ EOF
# Set AUDITWHEEL_* env vars for use with auditwheel
ENV AUDITWHEEL_POLICY=${POLICY} AUDITWHEEL_ARCH=${REAL_ARCH} AUDITWHEEL_PLAT=${POLICY}_${REAL_ARCH}

# Set sccache env vars
ENV CMAKE_CUDA_COMPILER_LAUNCHER=sccache
ENV CMAKE_CXX_COMPILER_LAUNCHER=sccache
ENV CMAKE_C_COMPILER_LAUNCHER=sccache
ENV SCCACHE_BUCKET=rapids-sccache-east
ENV SCCACHE_REGION=us-east-2
ENV SCCACHE_IDLE_TIMEOUT=32768
ENV SCCACHE_S3_USE_SSL=true
ENV SCCACHE_S3_NO_CREDENTIALS=false

# Install ucx
ARG UCX_VER=1.14.1
Expand Down Expand Up @@ -198,7 +189,7 @@ EOF

RUN <<EOF
pyenv global ${PYTHON_VER}
python -m pip install auditwheel patchelf twine rapids-dependency-file-generator dunamai
python -m pip install auditwheel patchelf twine "rapids-dependency-file-generator==1.*" dunamai
pyenv rehash
EOF

Expand Down
4 changes: 1 addition & 3 deletions matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ exclude:
- LINUX_VER: "rockylinux8"
IMAGE_REPO: "citestwheel"

# exclude citestwheel and ci-wheel for ubuntu22.04
- LINUX_VER: "ubuntu22.04"
IMAGE_REPO: "citestwheel"
# exclude ci-wheel for ubuntu22.04
- LINUX_VER: "ubuntu22.04"
IMAGE_REPO: "ci-wheel"

Expand Down

0 comments on commit d005eb1

Please sign in to comment.