diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4529df66..f91d6ba3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,7 +94,7 @@ jobs: ARCH: x86_64 TARGET_PLATFORM: linux-64 DOCKER_ARCH: amd64 - DOCKERIMAGE: condaforge/linux-anvil-comp7 + DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64 MINIFORGE_NAME: "Miniforge3" OS_NAME: "Linux" @@ -102,7 +102,7 @@ jobs: ARCH: x86_64 TARGET_PLATFORM: linux-64 DOCKER_ARCH: amd64 - DOCKERIMAGE: condaforge/linux-anvil-comp7 + DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64 MINIFORGE_NAME: "Mambaforge" OS_NAME: "Linux" @@ -152,7 +152,7 @@ jobs: ARCH: x86_64 TARGET_PLATFORM: linux-64 DOCKER_ARCH: amd64 - DOCKERIMAGE: condaforge/linux-anvil-comp7 + DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64 MINIFORGE_NAME: "Miniforge-pypy3" OS_NAME: "Linux" @@ -160,7 +160,7 @@ jobs: ARCH: x86_64 TARGET_PLATFORM: linux-64 DOCKER_ARCH: amd64 - DOCKERIMAGE: condaforge/linux-anvil-comp7 + DOCKERIMAGE: condaforge/linux-anvil-cos7-x86_64 MINIFORGE_NAME: "Mambaforge-pypy3" OS_NAME: "Linux" diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 100d893c..5431e1bd 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,7 +1,9 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} -{% set version = os.environ.get("MINIFORGE_VERSION", "24.5.0-0") %} -{% set conda_libmamba_solver_version = "24.1.0"%} -{% set mamba_version = "1.5.8"%} +{% set version = os.environ.get("MINIFORGE_VERSION", "24.7.1-0") %} +{% set conda_libmamba_solver_version = "24.7.0"%} +# when mamba_version is updated here, also update MICROMAMBA_VERSION +# in scripts/build.sh +{% set mamba_version = "1.5.9"%} name: {{ name }} version: {{ version }} @@ -49,5 +51,11 @@ specs: - pip - miniforge_console_shortcut 1.* # [win] +{% if name.startswith("Mambaforge") %} pre_install: mambaforge_deprecation.sh # [unix] pre_install: mambaforge_deprecation.bat # [win] +{% endif %} + +virtual_specs: + - __glibc >=2.17 # [linux] + - __osx >=10.13 # [osx] diff --git a/scripts/build.sh b/scripts/build.sh index 9891a5d9..30f43a33 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -14,7 +14,7 @@ echo "***** Install constructor *****" mamba install --yes \ --channel conda-forge --override-channels \ jinja2 curl libarchive \ - "constructor>=3.4.5" + "constructor>=3.9.3" if [[ "$(uname)" == "Darwin" ]]; then mamba install --yes \ @@ -38,7 +38,7 @@ cp LICENSE "${TEMP_DIR}/" ls -al "${TEMP_DIR}" if [[ "${TARGET_PLATFORM}" != win-* ]]; then - MICROMAMBA_VERSION=1.5.8 + MICROMAMBA_VERSION=1.5.9 MICROMAMBA_BUILD=0 mkdir "${TEMP_DIR}/micromamba" pushd "${TEMP_DIR}/micromamba"