From 552adb1be97b03f2338e8f784c2f19c7a36b216a Mon Sep 17 00:00:00 2001
From: Mark Harfouche <mark.harfouche@gmail.com>
Date: Sat, 8 Feb 2025 13:40:07 -0500
Subject: [PATCH] Revert Mamba2 - Make it easier to update

I don't want to leave this repo broken for too long.

Hopefully these additions will help alleviate the update burden in the
future
---
 Miniforge3/construct.yaml | 6 +++---
 scripts/build.sh          | 4 +++-
 scripts/test.sh           | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml
index 31c6e9ea..e148466d 100644
--- a/Miniforge3/construct.yaml
+++ b/Miniforge3/construct.yaml
@@ -1,6 +1,6 @@
-{% set version = os.environ.get("MINIFORGE_VERSION", "25.1.1-0") %}
-{% set conda_libmamba_solver_version = "25.1.1"%}
-# When `mamba_version` is updated here, also update the value of:
+{% set version = os.environ.get("MINIFORGE_VERSION", "24.11.3-0") %}
+{% set conda_libmamba_solver_version = "24.9.0"%}
+# This file is parsed by the scripts to define
 #   - `MICROMAMBA_VERSION` in `scripts/build.sh`
 #   - `MAMBA_VERSION` in `scripts/test.sh`
 {% set mamba_version = "2.0.6" %}
diff --git a/scripts/build.sh b/scripts/build.sh
index aac085a4..4e971c44 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -37,8 +37,10 @@ cp LICENSE "${TEMP_DIR}/"
 
 ls -al "${TEMP_DIR}"
 
+
 if [[ "${TARGET_PLATFORM}" != win-* ]]; then
-    MICROMAMBA_VERSION=2.0.6
+    # Assumes specific structure in construct.yaml
+    MICROMAMBA_VERSION=$(grep "set mamba_version" Miniforge3/construct.yaml | cut -d '=' -f 2 | cut -d '"' -f 2)
     MICROMAMBA_BUILD=0
     mkdir "${TEMP_DIR}/micromamba"
     pushd "${TEMP_DIR}/micromamba"
diff --git a/scripts/test.sh b/scripts/test.sh
index 089f27de..a57559d1 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -5,7 +5,7 @@ set -ex
 echo "***** Start: Testing Miniforge installer *****"
 
 export CONDA_PATH="${HOME}/miniforge"
-export MAMBA_VERSION="${MAMBA_VERSION:-2.0.6}"
+export MAMBA_VERSION=$(grep "set mamba_version" Miniforge3/construct.yaml | cut -d '=' -f 2 | cut -d '"' -f 2)
 
 CONSTRUCT_ROOT="${CONSTRUCT_ROOT:-${PWD}}"