Skip to content

Commit

Permalink
Merge pull request #260 from chrisburr/fix-cross-compile
Browse files Browse the repository at this point in the history
Update commit of constructor used to fix cross-compilation
  • Loading branch information
isuruf authored Feb 9, 2022
2 parents 9359c18 + ebb4dee commit b01e48e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
3 changes: 2 additions & 1 deletion Miniforge3/construct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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") %}
Expand All @@ -25,7 +26,7 @@ specs:
{% endif %}

{% if name.startswith("Mambaforge") %}
- mamba 0.20.0
- mamba 0.21.0
{% endif %}
- conda {{ version.split("-")[0] }}

Expand Down
7 changes: 5 additions & 2 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 *****"
Expand All @@ -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.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"
Expand All @@ -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}"
Expand Down

0 comments on commit b01e48e

Please sign in to comment.