Skip to content

Commit e97c527

Browse files
authored
Merge pull request #358 from hmaarrfk/update-mamba_only
Update mamba to 0.27.0 and add checks for boa
2 parents 928ac2f + 62f3760 commit e97c527

File tree

5 files changed

+31
-5
lines changed

5 files changed

+31
-5
lines changed

Miniforge3/construct.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% set version = os.environ.get("MINIFORGE_VERSION", "4.14.0-0") %}
1+
{% set version = os.environ.get("MINIFORGE_VERSION", "4.14.0-1") %}
22
{% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}
33

44
name: {{ name }}
@@ -27,7 +27,7 @@ specs:
2727
{% endif %}
2828

2929
{% if name.startswith("Mambaforge") %}
30-
- mamba 0.25.0
30+
- mamba 0.27.0
3131
{% endif %}
3232
- conda {{ version.split("-")[0] }}
3333

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ After construction on the CI, the installer is tested against a range of distrib
190190
- Ubuntu 16.04 ([LTS](https://ubuntu.com/about/release-cycle))
191191
- Ubuntu 18.04 ([LTS](https://ubuntu.com/about/release-cycle))
192192
- Ubuntu 20.04 ([LTS](https://ubuntu.com/about/release-cycle))
193-
- Ubuntu 21.10 (Latest non-LTS version)
193+
- Ubuntu 22.04 (Latest release -- also happens to be LTS)
194194
195195
## Local usage
196196

build_miniforge.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ docker run --rm -v "$(pwd):/construct" \
3333
"${DOCKERIMAGE}" /construct/scripts/build.sh
3434

3535
echo "============= Test the installer ============="
36-
for TEST_IMAGE_NAME in "ubuntu:21.10" "ubuntu:20.04" "ubuntu:18.04" "ubuntu:16.04" "centos:7" "debian:bullseye" "debian:buster"; do
36+
for TEST_IMAGE_NAME in "ubuntu:22.04" "ubuntu:20.04" "ubuntu:18.04" "ubuntu:16.04" "centos:7" "debian:bullseye" "debian:buster"; do
3737
echo "============= Test installer on ${TEST_IMAGE_NAME} ============="
3838
docker run --rm -v "$(pwd):/construct" -e CONSTRUCT_ROOT \
3939
"${DOCKER_ARCH}/${TEST_IMAGE_NAME}" /construct/scripts/test.sh

scripts/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ cp LICENSE "${TEMP_DIR}/"
3838
ls -al "${TEMP_DIR}"
3939

4040
if [[ "${TARGET_PLATFORM}" != win-* ]]; then
41-
MICROMAMBA_VERSION=0.24.0
41+
MICROMAMBA_VERSION=0.27.0
4242
mkdir "${TEMP_DIR}/micromamba"
4343
pushd "${TEMP_DIR}/micromamba"
4444
curl -L -O "https://anaconda.org/conda-forge/micromamba/${MICROMAMBA_VERSION}/download/${TARGET_PLATFORM}/micromamba-${MICROMAMBA_VERSION}-0.tar.bz2"

scripts/test.sh

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ else
1818
EXT="sh";
1919
fi
2020
INSTALLER_PATH=$(find build/ -name "*forge*.${EXT}" | head -n 1)
21+
INSTALLER_NAME=$(basename "${INSTALLER_PATH}" | cut -d "-" -f 1)
2122

2223
echo "***** Run the installer *****"
2324
chmod +x "${INSTALLER_PATH}"
@@ -43,6 +44,17 @@ if [[ "$(uname)" == MINGW* ]]; then
4344
echo "***** Check if we can install a package which requires msys2 *****"
4445
conda.exe install r-base --yes --quiet
4546
conda.exe list
47+
48+
if [[ "${INSTALLER_NAME}" == "Mambaforge" ]]; then
49+
echo "***** Mambaforge detected. Checking for boa compatibility *****"
50+
mamba_version_start=$(mamba --version | grep mamba | cut -d ' ' -f 2)
51+
mamba.exe install boa --yes
52+
mamba_version_end=$(mamba --version | grep mamba | cut -d ' ' -f 2)
53+
if [[ "${mamba_version_start}" != "${mamba_version_end}" ]]; then
54+
echo "mamba version changed from ${mamba_version_start} to ${mamba_version_end}"
55+
exit 1
56+
fi
57+
fi
4658
else
4759
bash "${INSTALLER_PATH}" -b -p "${CONDA_PATH}"
4860

@@ -53,6 +65,20 @@ else
5365
echo "***** Print conda info *****"
5466
conda info
5567
conda list
68+
conda clean --yes --index-cache
69+
70+
if [[ "${INSTALLER_NAME}" == "Mambaforge" ]]; then
71+
echo "***** Mambaforge detected. Checking for boa compatibility *****"
72+
mamba_version_start=$(mamba --version | grep mamba | cut -d ' ' -f 2)
73+
mamba info
74+
mamba install "mamba=${mamba_version_start}" boa --yes
75+
mamba_version_end=$(mamba --version | grep mamba | cut -d ' ' -f 2)
76+
if [[ "${mamba_version_start}" != "${mamba_version_end}" ]]; then
77+
echo "mamba version changed from ${mamba_version_start} to ${mamba_version_end}"
78+
exit 1
79+
fi
80+
81+
fi
5682
fi
5783

5884

0 commit comments

Comments
 (0)