From 61adca8b0ecd7668c26b95fdd77609008d8c7d46 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Fri, 29 Sep 2023 07:53:56 -0400 Subject: [PATCH 1/8] Update to conda 23.7 and mamba 1.5.1 --- Miniforge3/construct.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 8869012d..11b7033a 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,7 +1,7 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} -{% set version = os.environ.get("MINIFORGE_VERSION", "23.3.1-0") %} -{% set conda_libmamba_solver_version = "23.3.0"%} -{% set mamba_version = "1.4.2"%} +{% set version = os.environ.get("MINIFORGE_VERSION", "23.7.4-0") %} +{% set conda_libmamba_solver_version = "23.7.4"%} +{% set mamba_version = "1.5.1"%} name: {{ name }} version: {{ version }} From f0915510b48bbe549b2ccd62e8aa65c5b920a919 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Fri, 29 Sep 2023 07:58:02 -0400 Subject: [PATCH 2/8] Update libmamba solver version --- Miniforge3/construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 11b7033a..1a5536a2 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,6 +1,6 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} {% set version = os.environ.get("MINIFORGE_VERSION", "23.7.4-0") %} -{% set conda_libmamba_solver_version = "23.7.4"%} +{% set conda_libmamba_solver_version = "23.9.1"%} {% set mamba_version = "1.5.1"%} name: {{ name }} From bb36f89ba477a6293c32e91d5558f986ab5a2d3b Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Fri, 29 Sep 2023 08:14:37 -0400 Subject: [PATCH 3/8] downgrade --- Miniforge3/construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 1a5536a2..e84646c2 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,6 +1,6 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} {% set version = os.environ.get("MINIFORGE_VERSION", "23.7.4-0") %} -{% set conda_libmamba_solver_version = "23.9.1"%} +{% set conda_libmamba_solver_version = "23.7.0"%} {% set mamba_version = "1.5.1"%} name: {{ name }} From 732b937f518e6ae94031574297a8fc02f8f80fda Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Fri, 29 Sep 2023 16:21:43 -0400 Subject: [PATCH 4/8] Update Miniforge3/construct.yaml --- Miniforge3/construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index e84646c2..1a5536a2 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,6 +1,6 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} {% set version = os.environ.get("MINIFORGE_VERSION", "23.7.4-0") %} -{% set conda_libmamba_solver_version = "23.7.0"%} +{% set conda_libmamba_solver_version = "23.9.1"%} {% set mamba_version = "1.5.1"%} name: {{ name }} From fc2a705571dc46e0b344788b1fc862ae93dd8f1a Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 8 Nov 2023 08:33:07 -0500 Subject: [PATCH 5/8] Update construct.yaml --- Miniforge3/construct.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 1a5536a2..d41d32d9 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,7 +1,7 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} {% set version = os.environ.get("MINIFORGE_VERSION", "23.7.4-0") %} -{% set conda_libmamba_solver_version = "23.9.1"%} -{% set mamba_version = "1.5.1"%} +{% set conda_libmamba_solver_version = "23.10.0"%} +{% set mamba_version = "1.5.3"%} name: {{ name }} version: {{ version }} From c1cc90a5cef738c96eb791b7c87f8bf3934e4dd3 Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Wed, 8 Nov 2023 08:33:41 -0500 Subject: [PATCH 6/8] Update versions --- Miniforge3/construct.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index d41d32d9..4cce0d13 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,6 +1,6 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} -{% set version = os.environ.get("MINIFORGE_VERSION", "23.7.4-0") %} -{% set conda_libmamba_solver_version = "23.10.0"%} +{% set version = os.environ.get("MINIFORGE_VERSION", "23.10.0-0") %} +{% set conda_libmamba_solver_version = "23.11.0"%} {% set mamba_version = "1.5.3"%} name: {{ name }} From cce37bfd88219f203abc0a264f44c4be9a157473 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Mon, 20 Nov 2023 20:41:49 +0100 Subject: [PATCH 7/8] Try setup-miniconda for macOS Signed-off-by: Marcel Bargull --- .github/workflows/ci.yml | 2 +- build_miniforge_osx.sh | 28 ++-------------------------- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0e4096d9..615bee59 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -194,7 +194,7 @@ jobs: miniforge-version: "latest" miniforge-variant: Mambaforge use-mamba: true - if: contains(matrix.OS_NAME, 'Windows') + if: ${{ ! contains(matrix.OS_NAME, 'Linux') }} - name: Build and test miniforge env: diff --git a/build_miniforge_osx.sh b/build_miniforge_osx.sh index ed86225f..e8473b4a 100755 --- a/build_miniforge_osx.sh +++ b/build_miniforge_osx.sh @@ -1,32 +1,8 @@ #!/bin/bash -set -e -set -x +set -eux -echo "Installing a fresh version of Miniforge3." -# Keep variable names in sync with -# https://github.com/conda-forge/docker-images/blob/main/scripts/run_commands -miniforge_arch="$(uname -m)" -miniforge_version="4.14.0-0" -condapkg="https://github.com/conda-forge/miniforge/releases/download/${miniforge_version}/Mambaforge-${miniforge_version}-MacOSX-${miniforge_arch}.sh" -if [ "$(uname -m)" = "x86_64" ]; then - conda_checksum="949f046b4404cc8e081807b048050e6642d8db5520c20d5158a7ef721fbf76c5" -elif [ "$(uname -m)" = "arm64" ]; then - conda_checksum="35d05a65e19b8e5d596964936ddd6023ae66d664a25ba291a52fec18f06a73b6" -else - exit 1 -fi -curl -s -L "$condapkg" -o miniconda.sh -openssl sha256 miniconda.sh | grep $conda_checksum - -bash miniconda.sh -b -p ~/conda - -echo "Configuring conda." -# shellcheck disable=SC1090 -source ~/conda/bin/activate root - -export CONSTRUCT_ROOT="${PWD}" -mkdir -p build +eval "$(PS1="${PS1-}" conda shell.posix activate)" bash scripts/build.sh # shellcheck disable=SC2154 From dd7f8bd6807973fa5ba6306603baae6c6001f333 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Mon, 20 Nov 2023 21:07:44 +0100 Subject: [PATCH 8/8] Update to conda-libmamba-solver=23.11.1 Signed-off-by: Marcel Bargull --- Miniforge3/construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 4cce0d13..599cdb98 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,6 +1,6 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} {% set version = os.environ.get("MINIFORGE_VERSION", "23.10.0-0") %} -{% set conda_libmamba_solver_version = "23.11.0"%} +{% set conda_libmamba_solver_version = "23.11.1"%} {% set mamba_version = "1.5.3"%} name: {{ name }}