From e606b47bef35e1dce481825a213f7bdb109082ef Mon Sep 17 00:00:00 2001 From: Marco Esters Date: Tue, 19 Dec 2023 07:28:48 -0800 Subject: [PATCH] Update to Miniconda 23.11.0 (#456) * Deprecate ppc64le * Update Miniconda to v23.11.0 * Remove ppc64le from workflow run --- .github/workflows/miniconda_debian_ci.yml | 4 ++-- miniconda3/debian/Dockerfile | 11 ++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/miniconda_debian_ci.yml b/.github/workflows/miniconda_debian_ci.yml index d69a6446..0e7bcc3f 100644 --- a/.github/workflows/miniconda_debian_ci.yml +++ b/.github/workflows/miniconda_debian_ci.yml @@ -30,7 +30,7 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3 with: - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x + platforms: linux/amd64,linux/arm64,linux/s390x - name: Set up Docker Buildx id: buildx @@ -57,5 +57,5 @@ jobs: file: ./miniconda3/debian/Dockerfile tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x + platforms: linux/amd64,linux/arm64,linux/s390x push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags') }} diff --git a/miniconda3/debian/Dockerfile b/miniconda3/debian/Dockerfile index 4abb2ca7..64a3249d 100644 --- a/miniconda3/debian/Dockerfile +++ b/miniconda3/debian/Dockerfile @@ -27,22 +27,19 @@ ENV PATH /opt/conda/bin:$PATH CMD [ "/bin/bash" ] # Leave these args here to better use the Docker build cache -ARG CONDA_VERSION=py311_23.10.0-1 +ARG CONDA_VERSION=py311_23.11.0-1 RUN set -x && \ UNAME_M="$(uname -m)" && \ if [ "${UNAME_M}" = "x86_64" ]; then \ MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh"; \ - SHA256SUM="d0643508fa49105552c94a523529f4474f91730d3e0d1f168f1700c43ae67595"; \ + SHA256SUM="5b3cefe534e23541f5f703f40d4818e361c3615dbf14651a0f29554c3fc3d0fd"; \ elif [ "${UNAME_M}" = "s390x" ]; then \ MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-s390x.sh"; \ - SHA256SUM="ae212385c9d7f7473da7401d3f5f6cbbbc79a1fce730aa48531947e9c07e0808"; \ + SHA256SUM="04586c734987a39114b81384014c2cfa89360c518371b6fa249d3062efca27fe"; \ elif [ "${UNAME_M}" = "aarch64" ]; then \ MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-aarch64.sh"; \ - SHA256SUM="a60e70ad7e8ac5bb44ad876b5782d7cdc66e10e1f45291b29f4f8d37cc4aa2c8"; \ - elif [ "${UNAME_M}" = "ppc64le" ]; then \ - MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-ppc64le.sh"; \ - SHA256SUM="1a2eda0a9a52a4bd058abbe9de5bb2bc751fcd7904c4755deffdf938d6f4436e"; \ + SHA256SUM="63c06a1974695e50bbe767a030903d169e637e42d5b7b6d30876b19a01fbbad8"; \ fi && \ wget "${MINICONDA_URL}" -O miniconda.sh -q && \ echo "${SHA256SUM} miniconda.sh" > shasum && \