Skip to content

Commit

Permalink
Merge pull request #414 from hmaarrfk/fixup_constructor_bug
Browse files Browse the repository at this point in the history
Fixup constructor bug in 22.11.1-0 UNIX installers.
  • Loading branch information
hmaarrfk authored Jan 28, 2023
2 parents 6ce67e8 + 0d1824d commit 81191e6
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
9 changes: 6 additions & 3 deletions Miniforge3/construct.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = os.environ.get("MINIFORGE_VERSION", "22.11.1-0") %}
{% set version = os.environ.get("MINIFORGE_VERSION", "22.11.1-1") %}
{% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}

name: {{ name }}
Expand All @@ -16,8 +16,11 @@ write_condarc: True
# and keep the same with Miniconda
keep_pkgs: True
license_file: ../LICENSE
# Blocked until https://github.com/mamba-org/mamba/issues/1497 is fixed
# transmute_file_type: .conda

# During the interactive installation, these variables are checked.
# During batch installation, conda is never initialized
initialize_conda: True
initialize_by_default: True

specs:
{% if name.endswith("pypy3") %}
Expand Down
18 changes: 17 additions & 1 deletion scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,23 @@ if [[ "$(uname)" == MINGW* ]]; then
fi
fi
else
bash "${INSTALLER_PATH}" -b -p "${CONDA_PATH}"
# Test one of our installers in batch mode
if [[ "${INSTALLER_NAME}" == "Mambaforge" ]]; then
bash "${INSTALLER_PATH}" -b -p "${CONDA_PATH}"
# And the other in interactive mode
else
# Test interactive install. The install will ask the user to
# read the EULA
# then accept
# Then specify the path
# Then whether or not they want to initialize conda
cat <<EOF | bash "${INSTALLER_PATH}"
yes
${CONDA_PATH}
no
EOF
fi

echo "***** Setup conda *****"
# shellcheck disable=SC1091
Expand Down

0 comments on commit 81191e6

Please sign in to comment.