From d6a451c557f7ddcb3212a29d0fc84dcdb1bdf1de Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Thu, 13 Nov 2025 16:12:24 -0500 Subject: [PATCH 01/28] Revert "refactor(deps): remove `openssl` pin `<3.5.3` (#321)" This reverts commit 5804db4fad21af31e26291a17907fa8510059662. --- ci-conda.Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 4b0c7d4c..733a46ca 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -75,6 +75,9 @@ umask 002 # xref: https://github.com/conda-forge/libxml2-feedstock/issues/145 echo 'libxml2<2.14.0' >> /opt/conda/conda-meta/pinned +# Pin openssl to workaround install timeouts issue +echo 'openssl<3.5.3' >> /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 From a854e5cd2f73fc8622074c402db96184934f2d8d Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Thu, 13 Nov 2025 17:38:21 -0500 Subject: [PATCH 02/28] be very verbose --- ci-conda.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 733a46ca..896dd22b 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -80,7 +80,7 @@ echo 'openssl<3.5.3' >> /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 +rapids-mamba-retry update --all -vvvv -y -n base # install expected Python version PYTHON_MAJOR_VERSION=${PYTHON_VERSION%%.*} From dad3ac375a3c14ef450444d72f1b9a1ecca7fb3b Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 08:53:27 -0500 Subject: [PATCH 03/28] fix: set G_SLICE=always-malloc to stop deadlocking --- ci-conda.Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 896dd22b..bef18f0b 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -71,12 +71,16 @@ RUN <> /opt/conda/conda-meta/pinned # Pin openssl to workaround install timeouts issue -echo 'openssl<3.5.3' >> /opt/conda/conda-meta/pinned +# echo 'openssl<3.5.3' >> /opt/conda/conda-meta/pinned # update everything before other environment changes, to ensure mixing # an older conda with newer packages still works well From 1338da3577d4f1ebeeaceee02694d52b40eb8040 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 09:04:47 -0500 Subject: [PATCH 04/28] fix: set G_SLICE outside of docker --- .github/workflows/build-image.yaml | 4 ++++ ci-conda.Dockerfile | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml index 1956e366..45b54b6d 100644 --- a/.github/workflows/build-image.yaml +++ b/.github/workflows/build-image.yaml @@ -90,3 +90,7 @@ jobs: # https://github.com/docker/build-push-action/issues/755 provenance: false sbom: false + env: + # Set G_SLICE environment variable to work around `mamba` deadlocks + # see https://github.com/mamba-org/mamba/issues/1611 + G_SLICE: "always-malloc" diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index bef18f0b..4eeb3c18 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -71,10 +71,6 @@ RUN <> /opt/conda/conda-meta/pinned From 604ca296f3e2a6ee485fd08c6f630ee30f360eb0 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 09:08:35 -0500 Subject: [PATCH 05/28] refactor: remove G_SLICE, try setting `extract_threads` --- .github/workflows/build-image.yaml | 4 ---- ci-conda.Dockerfile | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml index 45b54b6d..1956e366 100644 --- a/.github/workflows/build-image.yaml +++ b/.github/workflows/build-image.yaml @@ -90,7 +90,3 @@ jobs: # https://github.com/docker/build-push-action/issues/755 provenance: false sbom: false - env: - # Set G_SLICE environment variable to work around `mamba` deadlocks - # see https://github.com/mamba-org/mamba/issues/1611 - G_SLICE: "always-malloc" diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 4eeb3c18..4d778940 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -75,8 +75,8 @@ umask 002 # xref: https://github.com/conda-forge/libxml2-feedstock/issues/145 echo 'libxml2<2.14.0' >> /opt/conda/conda-meta/pinned -# Pin openssl to workaround install timeouts issue -# echo 'openssl<3.5.3' >> /opt/conda/conda-meta/pinned +# Set extract threads to 1 to avoid deadlocks +mamba config set extract_threads 1 # update everything before other environment changes, to ensure mixing # an older conda with newer packages still works well From 11d63d31fa9380141d62ec5a41ca2b6b3c24bbe9 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 09:25:02 -0500 Subject: [PATCH 06/28] skip wheel images --- matrix.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/matrix.yaml b/matrix.yaml index 8fc3a44d..b05206ed 100644 --- a/matrix.yaml +++ b/matrix.yaml @@ -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" From 5855d94698e062bb192a1ccc2bb68ec2768e8133 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 09:25:51 -0500 Subject: [PATCH 07/28] disable lockfiles in mamba --- ci-conda.Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 4d778940..a1e13926 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -78,6 +78,9 @@ echo 'libxml2<2.14.0' >> /opt/conda/conda-meta/pinned # Set extract threads to 1 to avoid deadlocks mamba config set extract_threads 1 +# Disable `mamba` lockfiles +mamba config set use_lockfiles False + # update everything before other environment changes, to ensure mixing # an older conda with newer packages still works well rapids-mamba-retry update --all -vvvv -y -n base From 690548c81f0cd42bda02fdc0857da61e93df95da Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 09:37:30 -0500 Subject: [PATCH 08/28] Revert "disable lockfiles in mamba" This reverts commit 5855d94698e062bb192a1ccc2bb68ec2768e8133. --- ci-conda.Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index a1e13926..4d778940 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -78,9 +78,6 @@ echo 'libxml2<2.14.0' >> /opt/conda/conda-meta/pinned # Set extract threads to 1 to avoid deadlocks mamba config set extract_threads 1 -# Disable `mamba` lockfiles -mamba config set use_lockfiles False - # update everything before other environment changes, to ensure mixing # an older conda with newer packages still works well rapids-mamba-retry update --all -vvvv -y -n base From 64dc03776232bc5f9778bcedfaa755d6090f0fcd Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 09:38:56 -0500 Subject: [PATCH 09/28] fix: try G_SLICE again along with limiting extract_threads --- ci-conda.Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 4d778940..4e880852 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -80,7 +80,7 @@ mamba config set extract_threads 1 # update everything before other environment changes, to ensure mixing # an older conda with newer packages still works well -rapids-mamba-retry update --all -vvvv -y -n base +env G_SLICE=always-malloc rapids-mamba-retry update --all -vvvv -y -n base # install expected Python version PYTHON_MAJOR_VERSION=${PYTHON_VERSION%%.*} @@ -93,8 +93,9 @@ if [[ "$PYTHON_VERSION_PADDED" > "3.12" ]]; then else PYTHON_ABI_TAG="cpython" fi -rapids-mamba-retry install -y -n base "python>=${PYTHON_VERSION},<${PYTHON_UPPER_BOUND}=*_${PYTHON_ABI_TAG}" -rapids-mamba-retry update --all -y -n base + +env G_SLICE=always-malloc rapids-mamba-retry install -y -n base "python>=${PYTHON_VERSION},<${PYTHON_UPPER_BOUND}=*_${PYTHON_ABI_TAG}" +env G_SLICE=always-malloc rapids-mamba-retry update --all -y -n base if [[ "$LINUX_VER" == "rockylinux"* ]]; then dnf install -y findutils dnf clean all From eccbeb2e34f5f74f18e8d925c441a72f5e5ef9ca Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 09:49:17 -0500 Subject: [PATCH 10/28] Revert "fix: try G_SLICE again along with limiting extract_threads" This reverts commit 64dc03776232bc5f9778bcedfaa755d6090f0fcd. --- ci-conda.Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 4e880852..4d778940 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -80,7 +80,7 @@ mamba config set extract_threads 1 # update everything before other environment changes, to ensure mixing # an older conda with newer packages still works well -env G_SLICE=always-malloc rapids-mamba-retry update --all -vvvv -y -n base +rapids-mamba-retry update --all -vvvv -y -n base # install expected Python version PYTHON_MAJOR_VERSION=${PYTHON_VERSION%%.*} @@ -93,9 +93,8 @@ if [[ "$PYTHON_VERSION_PADDED" > "3.12" ]]; then else PYTHON_ABI_TAG="cpython" fi - -env G_SLICE=always-malloc rapids-mamba-retry install -y -n base "python>=${PYTHON_VERSION},<${PYTHON_UPPER_BOUND}=*_${PYTHON_ABI_TAG}" -env G_SLICE=always-malloc rapids-mamba-retry update --all -y -n base +rapids-mamba-retry install -y -n base "python>=${PYTHON_VERSION},<${PYTHON_UPPER_BOUND}=*_${PYTHON_ABI_TAG}" +rapids-mamba-retry update --all -y -n base if [[ "$LINUX_VER" == "rockylinux"* ]]; then dnf install -y findutils dnf clean all From 6547ca9996a412b315fc23e860956931eabdfc6c Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 09:49:31 -0500 Subject: [PATCH 11/28] fix: try using a single thread everywhere --- ci-conda.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 4d778940..2db30414 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -76,7 +76,7 @@ umask 002 echo 'libxml2<2.14.0' >> /opt/conda/conda-meta/pinned # Set extract threads to 1 to avoid deadlocks -mamba config set extract_threads 1 +mamba config set default_threads 1 # update everything before other environment changes, to ensure mixing # an older conda with newer packages still works well From e30c6377159ba1cd2b5e1d66b46acf4a9ef3a308 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 10:24:19 -0500 Subject: [PATCH 12/28] fix: upgrade `openssl` in a separate block? --- ci-conda.Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 2db30414..5fd52862 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -67,6 +67,8 @@ 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 +RUN rapids-mamba-retry update openssl=3.6.0 + RUN <> /opt/conda/conda-meta/pinned -# Set extract threads to 1 to avoid deadlocks -mamba config set default_threads 1 - # update everything before other environment changes, to ensure mixing # an older conda with newer packages still works well rapids-mamba-retry update --all -vvvv -y -n base From 555306fb48480ace513791fcf87f81dd49e38230 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 10:45:18 -0500 Subject: [PATCH 13/28] fix: try updating openssl and libcurl separately --- ci-conda.Dockerfile | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 5fd52862..20a30460 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -67,19 +67,24 @@ 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 -RUN rapids-mamba-retry update openssl=3.6.0 - RUN <> /opt/conda/conda-meta/pinned +echo 'openssl==3.6.0' >> /opt/conda/conda-meta/pinned +echo 'libcurl==8.17.0' >> /opt/conda/conda-meta/pinned + +rapids-mamba-retry update openssl libcurl -vvvv -y -n base + +EOF + +RUN < Date: Fri, 14 Nov 2025 11:23:26 -0500 Subject: [PATCH 14/28] fix: pin openssl and libcurl to prevent upgrading hang --- ci-conda.Dockerfile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 20a30460..78e665ca 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -68,19 +68,17 @@ COPY --from=miniforge-upstream --chown=root:conda --chmod=770 /opt/conda /opt/co RUN chmod g+ws /opt/conda RUN <> /opt/conda/conda-meta/pinned -echo 'openssl==3.6.0' >> /opt/conda/conda-meta/pinned -echo 'libcurl==8.17.0' >> /opt/conda/conda-meta/pinned -rapids-mamba-retry update openssl libcurl -vvvv -y -n base - -EOF - -RUN <> /opt/conda/conda-meta/pinned +echo 'libcurl==8.16.0' >> /opt/conda/conda-meta/pinned # update everything before other environment changes, to ensure mixing # an older conda with newer packages still works well From 3c40a6973e1200d5b9229fa75232d8e5f4846d02 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 12:28:37 -0500 Subject: [PATCH 15/28] fix: revert to older miniforge upstream, pin openssl and libcurl to match --- ci-conda.Dockerfile | 4 ++-- versions.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 78e665ca..978a4674 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -77,8 +77,8 @@ 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 'openssl==3.5.4' >> /opt/conda/conda-meta/pinned -echo 'libcurl==8.16.0' >> /opt/conda/conda-meta/pinned +echo 'openssl==3.5.1' >> /opt/conda/conda-meta/pinned +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 diff --git a/versions.yaml b/versions.yaml index 07ea681f..366164dd 100644 --- a/versions.yaml +++ b/versions.yaml @@ -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.9.1-0 +MINIFORGE_VER: 25.3.1-0 From c392700b0e6d65879d585082fac37570627d80b0 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 12:44:03 -0500 Subject: [PATCH 16/28] fix: unpin `openssl` --- ci-conda.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 978a4674..3ec9c946 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -77,7 +77,6 @@ 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 'openssl==3.5.1' >> /opt/conda/conda-meta/pinned echo 'libcurl==8.14.1' >> /opt/conda/conda-meta/pinned # update everything before other environment changes, to ensure mixing From 9a7719c871364ca6706e755bf312b58846b1b441 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 13:08:15 -0500 Subject: [PATCH 17/28] chore: restore wheel image builds --- matrix.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/matrix.yaml b/matrix.yaml index b05206ed..8fc3a44d 100644 --- a/matrix.yaml +++ b/matrix.yaml @@ -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" From c0e961bc2e8c5c1c85100cefc788b525dc19b3cd Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 13:33:25 -0500 Subject: [PATCH 18/28] chore: disable wheel builds --- matrix.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/matrix.yaml b/matrix.yaml index 8fc3a44d..b05206ed 100644 --- a/matrix.yaml +++ b/matrix.yaml @@ -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" From 4a9772616d2570fd10f4f8d79f7748baf71305ca Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 13:33:31 -0500 Subject: [PATCH 19/28] try: remove libcurl pin entirely --- ci-conda.Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 3ec9c946..4b0c7d4c 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -75,10 +75,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 From 80311edd6468d2dd75e54dfb20abff5f0eb5aa73 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 13:57:18 -0500 Subject: [PATCH 20/28] chore(deps): update `mamba` to 2.3.3 --- ci-conda.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 3ec9c946..a9531c18 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -67,6 +67,8 @@ 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 +RUN mamba install mamba=2.3.3 + RUN < Date: Fri, 14 Nov 2025 14:31:22 -0500 Subject: [PATCH 21/28] Revert "chore(deps): update `mamba` to 2.3.3" This reverts commit 80311edd6468d2dd75e54dfb20abff5f0eb5aa73. --- ci-conda.Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index a9531c18..3ec9c946 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -67,8 +67,6 @@ 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 -RUN mamba install mamba=2.3.3 - RUN < Date: Fri, 14 Nov 2025 14:33:52 -0500 Subject: [PATCH 22/28] chore(deps): update `conda-libmamba-solver` to 25.4.0 --- ci-conda.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 3ec9c946..f4386e03 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -67,6 +67,8 @@ 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 +RUN mamba install conda-libmamba-solver=25.4.0 + RUN < Date: Fri, 14 Nov 2025 14:57:54 -0500 Subject: [PATCH 23/28] Revert "chore(deps): update `conda-libmamba-solver` to 25.4.0" This reverts commit 69ac283e9ecc37fc24068e436a72e0e6c4c8d23a. --- ci-conda.Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index f4386e03..3ec9c946 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -67,8 +67,6 @@ 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 -RUN mamba install conda-libmamba-solver=25.4.0 - RUN < Date: Fri, 14 Nov 2025 14:58:43 -0500 Subject: [PATCH 24/28] chore: add in `mirrored_channels` --- ci-conda.Dockerfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 3ec9c946..829ed248 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -67,6 +67,17 @@ 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 `mirrored_channels` to mimic upstream change in 25.9.1-0 +COPY < Date: Fri, 14 Nov 2025 13:57:18 -0500 Subject: [PATCH 25/28] chore(deps): update `mamba` to 2.3.3 --- ci-conda.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 829ed248..f532f117 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -77,6 +77,7 @@ mirrored_channels: - https://prefix.dev/conda-forge EOF +RUN mamba install mamba=2.3.3 RUN < Date: Fri, 14 Nov 2025 15:46:59 -0500 Subject: [PATCH 26/28] chore: remove libcurl pin and mirrored_channels --- ci-conda.Dockerfile | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index f532f117..fa718262 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -67,16 +67,6 @@ 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 `mirrored_channels` to mimic upstream change in 25.9.1-0 -COPY <> /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 From 9c3da54f7915e7f812981b1c02c34e4062f0b7f2 Mon Sep 17 00:00:00 2001 From: Gil Forsyth Date: Fri, 14 Nov 2025 15:59:56 -0500 Subject: [PATCH 27/28] chore: bump upstream image version back to 25.9.1-0 --- ci-conda.Dockerfile | 2 -- versions.yaml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index fa718262..4b0c7d4c 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -67,8 +67,6 @@ 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 -RUN mamba install mamba=2.3.3 - RUN < Date: Fri, 14 Nov 2025 17:10:12 -0500 Subject: [PATCH 28/28] chore: remove `mirrored_channels` config option --- ci-conda.Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ci-conda.Dockerfile b/ci-conda.Dockerfile index 4b0c7d4c..4200afb9 100644 --- a/ci-conda.Dockerfile +++ b/ci-conda.Dockerfile @@ -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 <