Skip to content

Commit b01e48e

Browse files
authored
Merge pull request #260 from chrisburr/fix-cross-compile
Update commit of constructor used to fix cross-compilation
2 parents 9359c18 + ebb4dee commit b01e48e

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

Miniforge3/construct.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ write_condarc: True
1616
# and keep the same with Miniconda
1717
keep_pkgs: True
1818
license_file: ../LICENSE
19+
transmute_file_type: .conda
1920

2021
specs:
2122
{% if name.endswith("pypy3") %}
@@ -25,7 +26,7 @@ specs:
2526
{% endif %}
2627

2728
{% if name.startswith("Mambaforge") %}
28-
- mamba 0.20.0
29+
- mamba 0.21.0
2930
{% endif %}
3031
- conda {{ version.split("-")[0] }}
3132

scripts/build.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fi
2424
if [[ "${TARGET_PLATFORM}" == win-* ]]; then
2525
conda install -y "nsis=3.01" -c conda-forge --override-channels
2626
fi
27-
pip install git+git://github.com/chrisburr/constructor@40c312c8d3f63f9a76b93bf347f05b8e1f7c8228#egg=constructor --force --no-deps
27+
pip install git+git://github.com/chrisburr/constructor@51415f3d62091daae7d21dab84add91d3cc73039#egg=constructor --force --no-deps
2828
conda list
2929

3030
echo "***** Make temp directory *****"
@@ -41,7 +41,7 @@ cp LICENSE "${TEMP_DIR}/"
4141
ls -al "${TEMP_DIR}"
4242

4343
if [[ "${TARGET_PLATFORM}" != win-* ]]; then
44-
MICROMAMBA_VERSION=0.17.0
44+
MICROMAMBA_VERSION=0.21.0
4545
mkdir "${TEMP_DIR}/micromamba"
4646
pushd "${TEMP_DIR}/micromamba"
4747
curl -L -O "https://anaconda.org/conda-forge/micromamba/${MICROMAMBA_VERSION}/download/${TARGET_PLATFORM}/micromamba-${MICROMAMBA_VERSION}-0.tar.bz2"
@@ -57,8 +57,11 @@ if [[ "${TARGET_PLATFORM}" != win-* ]]; then
5757
fi
5858

5959
echo "***** Construct the installer *****"
60+
# Transmutation requires the current directory is writable
61+
cd "${TEMP_DIR}"
6062
# shellcheck disable=SC2086
6163
constructor "${TEMP_DIR}/Miniforge3/" --output-dir "${TEMP_DIR}" ${EXTRA_CONSTRUCTOR_ARGS}
64+
cd -
6265

6366
echo "***** Generate installer hash *****"
6467
cd "${TEMP_DIR}"

0 commit comments

Comments
 (0)