Skip to content

Commit

Permalink
Merge pull request #518 from mbargull/hmaarrfk/update_mamba
Browse files Browse the repository at this point in the history
 Update to conda 23.10 and mamba 1.5.3
  • Loading branch information
hmaarrfk authored Nov 26, 2023
2 parents 1a3e858 + dd7f8bd commit e4d124e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions Miniforge3/construct.yaml
Original file line number Diff line number Diff line change
@@ -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.10.0-0") %}
{% set conda_libmamba_solver_version = "23.11.1"%}
{% set mamba_version = "1.5.3"%}

name: {{ name }}
version: {{ version }}
Expand Down
28 changes: 2 additions & 26 deletions build_miniforge_osx.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit e4d124e

Please sign in to comment.