From f90c7379259c293f0d654c97d79e351cc7a1d8c4 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Tue, 8 Feb 2022 14:50:50 +0100 Subject: [PATCH 1/5] Update commit of constructor used to fix cross-compilation --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 8b2bca19..9275bf54 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -24,7 +24,7 @@ fi if [[ "${TARGET_PLATFORM}" == win-* ]]; then conda install -y "nsis=3.01" -c conda-forge --override-channels fi -pip install git+git://github.com/chrisburr/constructor@40c312c8d3f63f9a76b93bf347f05b8e1f7c8228#egg=constructor --force --no-deps +pip install git+git://github.com/chrisburr/constructor@51415f3d62091daae7d21dab84add91d3cc73039#egg=constructor --force --no-deps conda list echo "***** Make temp directory *****" From f3c459777225eb3e0f738a0f50df70f03df23558 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Tue, 8 Feb 2022 15:06:53 +0100 Subject: [PATCH 2/5] Use MICROMAMBA_VERSION=0.20.0 --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 9275bf54..df003651 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -41,7 +41,7 @@ cp LICENSE "${TEMP_DIR}/" ls -al "${TEMP_DIR}" if [[ "${TARGET_PLATFORM}" != win-* ]]; then - MICROMAMBA_VERSION=0.17.0 + MICROMAMBA_VERSION=0.20.0 mkdir "${TEMP_DIR}/micromamba" pushd "${TEMP_DIR}/micromamba" curl -L -O "https://anaconda.org/conda-forge/micromamba/${MICROMAMBA_VERSION}/download/${TARGET_PLATFORM}/micromamba-${MICROMAMBA_VERSION}-0.tar.bz2" From 9f35662a6e8d1c16a16754ae0b1377e2684db261 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Tue, 8 Feb 2022 16:28:28 +0100 Subject: [PATCH 3/5] Add transmute_file_type: .conda --- Miniforge3/construct.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index f09fdd46..1dd66623 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -16,6 +16,7 @@ write_condarc: True # and keep the same with Miniconda keep_pkgs: True license_file: ../LICENSE +transmute_file_type: .conda specs: {% if name.endswith("pypy3") %} From 875b88a1f2d79b18f70092eaf951e016fec3acef Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Wed, 9 Feb 2022 20:59:31 +0100 Subject: [PATCH 4/5] Change to a writable working directory before running constructor --- scripts/build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/build.sh b/scripts/build.sh index df003651..e1ebca31 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -57,8 +57,11 @@ if [[ "${TARGET_PLATFORM}" != win-* ]]; then fi echo "***** Construct the installer *****" +# Transmutation requires the current directory is writable +cd "${TEMP_DIR}" # shellcheck disable=SC2086 constructor "${TEMP_DIR}/Miniforge3/" --output-dir "${TEMP_DIR}" ${EXTRA_CONSTRUCTOR_ARGS} +cd - echo "***** Generate installer hash *****" cd "${TEMP_DIR}" From ebb4deef8d1fe9929ee4f842073ae4f6ecfdb239 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Wed, 9 Feb 2022 21:28:19 +0100 Subject: [PATCH 5/5] Use mamba 0.21.0 --- Miniforge3/construct.yaml | 2 +- scripts/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 1dd66623..d6fc1ed1 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -26,7 +26,7 @@ specs: {% endif %} {% if name.startswith("Mambaforge") %} - - mamba 0.20.0 + - mamba 0.21.0 {% endif %} - conda {{ version.split("-")[0] }} diff --git a/scripts/build.sh b/scripts/build.sh index e1ebca31..421754d6 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -41,7 +41,7 @@ cp LICENSE "${TEMP_DIR}/" ls -al "${TEMP_DIR}" if [[ "${TARGET_PLATFORM}" != win-* ]]; then - MICROMAMBA_VERSION=0.20.0 + MICROMAMBA_VERSION=0.21.0 mkdir "${TEMP_DIR}/micromamba" pushd "${TEMP_DIR}/micromamba" curl -L -O "https://anaconda.org/conda-forge/micromamba/${MICROMAMBA_VERSION}/download/${TARGET_PLATFORM}/micromamba-${MICROMAMBA_VERSION}-0.tar.bz2"