Skip to content

Commit

Permalink
Revert Mamba2 - Make it easier to update
Browse files Browse the repository at this point in the history
I don't want to leave this repo broken for too long.

Hopefully these additions will help alleviate the update burden in the
future
  • Loading branch information
hmaarrfk committed Feb 8, 2025
1 parent 9a0ae0c commit 552adb1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Miniforge3/construct.yaml
Original file line number Diff line number Diff line change
@@ -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" %}
Expand Down
4 changes: 3 additions & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Check failure on line 8 in scripts/test.sh

View workflow job for this annotation

GitHub Actions / lint

Declare and assign separately to avoid masking return values.

CONSTRUCT_ROOT="${CONSTRUCT_ROOT:-${PWD}}"

Expand Down

0 comments on commit 552adb1

Please sign in to comment.