Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
d6a451c
Revert "refactor(deps): remove `openssl` pin `<3.5.3` (#321)"
gforsyth Nov 13, 2025
a854e5c
be very verbose
gforsyth Nov 13, 2025
dad3ac3
fix: set G_SLICE=always-malloc to stop deadlocking
gforsyth Nov 14, 2025
1338da3
fix: set G_SLICE outside of docker
gforsyth Nov 14, 2025
604ca29
refactor: remove G_SLICE, try setting `extract_threads`
gforsyth Nov 14, 2025
11d63d3
skip wheel images
gforsyth Nov 14, 2025
5855d94
disable lockfiles in mamba
gforsyth Nov 14, 2025
690548c
Revert "disable lockfiles in mamba"
gforsyth Nov 14, 2025
64dc037
fix: try G_SLICE again along with limiting extract_threads
gforsyth Nov 14, 2025
eccbeb2
Revert "fix: try G_SLICE again along with limiting extract_threads"
gforsyth Nov 14, 2025
6547ca9
fix: try using a single thread everywhere
gforsyth Nov 14, 2025
e30c637
fix: upgrade `openssl` in a separate block?
gforsyth Nov 14, 2025
555306f
fix: try updating openssl and libcurl separately
gforsyth Nov 14, 2025
8995e3b
fix: pin openssl and libcurl to prevent upgrading hang
gforsyth Nov 14, 2025
3c40a69
fix: revert to older miniforge upstream, pin openssl and libcurl to m…
gforsyth Nov 14, 2025
c392700
fix: unpin `openssl`
gforsyth Nov 14, 2025
a93f3bb
Merge branch 'main' into restore_openssl_pin
gforsyth Nov 14, 2025
9a7719c
chore: restore wheel image builds
gforsyth Nov 14, 2025
c0e961b
chore: disable wheel builds
gforsyth Nov 14, 2025
4a97726
try: remove libcurl pin entirely
gforsyth Nov 14, 2025
a54b21b
Merge branch 'main' into isolate_hangs
gforsyth Nov 14, 2025
80311ed
chore(deps): update `mamba` to 2.3.3
gforsyth Nov 14, 2025
554aa90
Revert "chore(deps): update `mamba` to 2.3.3"
gforsyth Nov 14, 2025
69ac283
chore(deps): update `conda-libmamba-solver` to 25.4.0
gforsyth Nov 14, 2025
20ed3bb
Revert "chore(deps): update `conda-libmamba-solver` to 25.4.0"
gforsyth Nov 14, 2025
d9b8866
chore: add in `mirrored_channels`
gforsyth Nov 14, 2025
6399f64
chore(deps): update `mamba` to 2.3.3
gforsyth Nov 14, 2025
34218f1
chore: remove libcurl pin and mirrored_channels
gforsyth Nov 14, 2025
9c3da54
chore: bump upstream image version back to 25.9.1-0
gforsyth Nov 14, 2025
16608ac
chore: remove `mirrored_channels` config option
gforsyth Nov 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ci-conda.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ COPY --from=miniforge-upstream --chown=root:conda --chmod=770 /opt/conda /opt/co
# Ensure new files are created with group write access & setgid. See https://unix.stackexchange.com/a/12845
RUN chmod g+ws /opt/conda

# Copy in custom condarc that removes `mirrored_channels` added upstream in 25.9.1-0
COPY <<EOF /opt/conda/.condarc
channels:
- conda-forge
EOF

RUN <<EOF
# Ensure new files/dirs have group write permissions
umask 002
Expand All @@ -75,10 +81,6 @@ umask 002
# xref: https://github.com/conda-forge/libxml2-feedstock/issues/145
echo 'libxml2<2.14.0' >> /opt/conda/conda-meta/pinned

# Temporary workaround for deadlocks in unpacking libcurl
# we hardcode this to match the versions in the upstream `miniforge3` image
echo 'libcurl==8.14.1' >> /opt/conda/conda-meta/pinned

# update everything before other environment changes, to ensure mixing
# an older conda with newer packages still works well
rapids-mamba-retry update --all -y -n base
Expand Down
12 changes: 6 additions & 6 deletions matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ CI_IMAGE_CONFIG:
- IMAGE_REPO: "ci-conda"
dockerfile: ci-conda.Dockerfile
docker_target: ""
- IMAGE_REPO: "ci-wheel"
dockerfile: ci-wheel.Dockerfile
docker_target: ""
- IMAGE_REPO: "citestwheel"
dockerfile: citestwheel.Dockerfile
docker_target: ""
# - IMAGE_REPO: "ci-wheel"
# dockerfile: ci-wheel.Dockerfile
# docker_target: ""
# - IMAGE_REPO: "citestwheel"
# dockerfile: citestwheel.Dockerfile
# docker_target: ""
exclude:
# Exclusions from CUDA's OS support matrix
- LINUX_VER: "ubuntu24.04"
Expand Down
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ YQ_VER: 4.48.1
# renovate: datasource=github-releases depName=aws/aws-cli
AWS_CLI_VER: 2.28.1
# renovate: datasource=docker depName=condaforge/miniforge3 versioning=docker
MINIFORGE_VER: 25.3.1-0
MINIFORGE_VER: 25.9.1-0
Loading