Merge pull request #655 from hmaarrfk/update_24.9

Update to 24.9
conda-forge · Oct 23, 2024 · 212a784 · 212a784
2 parents 168f4d5 + d76a6ec
commit 212a784
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -72,15 +72,20 @@ jobs:
           - os: ubuntu-latest
             ARCH: aarch64
             TARGET_PLATFORM: linux-aarch64
-            DOCKER_ARCH: arm64v8
+            DOCKER_ARCH: arm64/v8
             DOCKERIMAGE: condaforge/linux-anvil-aarch64
             MINIFORGE_NAME: "Miniforge3"
             OS_NAME: "Linux"
+            # Reduce the test matrix because the builds timeouts on emulated architectures
+            # The time consuming operation is an attempt a full solve of conda/mamba/boa
+            # for as a compatibility
+            # xref https://github.com/conda-forge/miniforge/pull/361
+            TEST_IMAGE_NAMES: "ubuntu:24.04"
 
           - os: ubuntu-latest
             ARCH: aarch64
             TARGET_PLATFORM: linux-aarch64
-            DOCKER_ARCH: arm64v8
+            DOCKER_ARCH: arm64/v8
             DOCKERIMAGE: condaforge/linux-anvil-aarch64
             MINIFORGE_NAME: "Mambaforge"
             OS_NAME: "Linux"
@@ -113,6 +118,11 @@ jobs:
             DOCKERIMAGE: condaforge/linux-anvil-ppc64le
             MINIFORGE_NAME: "Miniforge3"
             OS_NAME: "Linux"
+            # Reduce the test matrix because the builds timeouts on emulated architectures
+            # The time consuming operation is an attempt a full solve of conda/mamba/boa
+            # for as a compatibility
+            # xref https://github.com/conda-forge/miniforge/pull/361
+            TEST_IMAGE_NAMES: "ubuntu:24.04"
 
           - os: ubuntu-latest
             ARCH: ppc64le
@@ -130,15 +140,20 @@ jobs:
           - os: ubuntu-latest
             ARCH: aarch64
             TARGET_PLATFORM: linux-aarch64
-            DOCKER_ARCH: arm64v8
+            DOCKER_ARCH: arm64/v8
             DOCKERIMAGE: condaforge/linux-anvil-aarch64
             MINIFORGE_NAME: "Miniforge-pypy3"
             OS_NAME: "Linux"
+            # Reduce the test matrix because the builds timeouts on emulated architectures
+            # The time consuming operation is an attempt a full solve of conda/mamba/boa
+            # for as a compatibility
+            # xref https://github.com/conda-forge/miniforge/pull/361
+            TEST_IMAGE_NAMES: "ubuntu:24.04"
 
           - os: ubuntu-latest
             ARCH: aarch64
             TARGET_PLATFORM: linux-aarch64
-            DOCKER_ARCH: arm64v8
+            DOCKER_ARCH: arm64/v8
             DOCKERIMAGE: condaforge/linux-anvil-aarch64
             MINIFORGE_NAME: "Mambaforge-pypy3"
             OS_NAME: "Linux"
@@ -171,6 +186,11 @@ jobs:
             DOCKERIMAGE: condaforge/linux-anvil-ppc64le
             MINIFORGE_NAME: "Miniforge-pypy3"
             OS_NAME: "Linux"
+            # Reduce the test matrix because the builds timeouts on emulated architectures
+            # The time consuming operation is an attempt a full solve of conda/mamba/boa
+            # for as a compatibility
+            # xref https://github.com/conda-forge/miniforge/pull/361
+            TEST_IMAGE_NAMES: "ubuntu:24.04"
 
           - os: ubuntu-latest
             ARCH: ppc64le

diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml
@@ -1,8 +1,7 @@
 {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}
-{% set version = os.environ.get("MINIFORGE_VERSION", "24.7.1-1") %}
-{% set conda_libmamba_solver_version = "24.7.0"%}
-# when mamba_version is updated here, also update MICROMAMBA_VERSION
-# in scripts/build.sh
+{% set version = os.environ.get("MINIFORGE_VERSION", "24.9.1-1") %}
+{% set conda_libmamba_solver_version = "24.9.0"%}
+# when mamba_version is updated here, also update MICROMAMBA_VERSION in scripts/build.sh
 {% set mamba_version = "1.5.9"%}
 
 name: {{ name }}

diff --git a/build_miniforge.sh b/build_miniforge.sh
@@ -12,7 +12,7 @@ set -ex
 # Check parameters
 ARCH=${ARCH:-aarch64}
 export TARGET_PLATFORM=${TARGET_PLATFORM:-linux-aarch64}
-DOCKER_ARCH=${DOCKER_ARCH:-arm64v8}
+DOCKER_ARCH=${DOCKER_ARCH:-arm64/v8}
 DOCKERIMAGE=${DOCKERIMAGE:-condaforge/linux-anvil-aarch64}
 export MINIFORGE_NAME=${MINIFORGE_NAME:-Miniforge3}
 OS_NAME=${OS_NAME:-Linux}
@@ -38,5 +38,5 @@ for TEST_IMAGE_NAME in ${TEST_IMAGE_NAMES}; do
   echo "============= Test installer on ${TEST_IMAGE_NAME} ============="
   docker run --rm \
     -v "$(pwd):${CONSTRUCT_ROOT}" -e CONSTRUCT_ROOT \
-    "${DOCKER_ARCH}/${TEST_IMAGE_NAME}" /construct/scripts/test.sh
+     --platform "linux/${DOCKER_ARCH}" "${DOCKER_ARCH/\//}/${TEST_IMAGE_NAME}" /construct/scripts/test.sh
 done
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -56,15 +56,15 @@ if [[ "$(uname)" == MINGW* ]]; then
 else
   # Test one of our installers in batch mode
   if [[ "${INSTALLER_NAME}" == "Mambaforge" ]]; then
-    bash "${INSTALLER_PATH}" -b -p "${CONDA_PATH}"
+    sh "${INSTALLER_PATH}" -b -p "${CONDA_PATH}"
   # And the other in interactive mode
   else
     # Test interactive install. The install will ask the user to
     # - newline -- read the EULA
     # - yes -- then accept
     # - ${CONDA_PATH} -- Then specify the path
     # - no -- Then whether or not they want to initialize conda
-    cat <<EOF | bash "${INSTALLER_PATH}"
+    cat <<EOF | sh "${INSTALLER_PATH}"
 
 yes
 ${CONDA_PATH}