Remove extra hack

conda-forge · Oct 26, 2022 · ab5e888 · ab5e888
1 parent 8de9ab1
commit ab5e888
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -174,9 +174,6 @@ jobs:
             # for as a compatibility
             # xref https://github.com/conda-forge/miniforge/pull/361
             TEST_IMAGE_NAMES: "centos:7"
-            # It turns out, tat on this particular image, even a single test
-            # for compatibility does not finish in time.
-            TEST_CONDA_MAMBA_BOA_COMPATIBILITY: "no"
 
     steps:
     - name: Checkout code

diff --git a/build_miniforge.sh b/build_miniforge.sh
@@ -18,7 +18,6 @@ export MINIFORGE_NAME=${MINIFORGE_NAME:-Miniforge3}
 OS_NAME=${OS_NAME:-Linux}
 EXT=${EXT:-sh}
 TEST_IMAGE_NAMES=${TEST_IMAGE_NAMES:-ubuntu:22.04 ubuntu:20.04 ubuntu:18.04 ubuntu:16.04 centos:7 debian:bullseye debian:buster}
-TEST_CONDA_MAMBA_BOA_COMPATIBILITY=${TEST_CONDA_MAMBA_BOA_COMPATIBILITY:-yes}
 export CONSTRUCT_ROOT=/construct
 
 echo "============= Create build directory ============="
@@ -39,6 +38,5 @@ for TEST_IMAGE_NAME in ${TEST_IMAGE_NAMES}; do
   echo "============= Test installer on ${TEST_IMAGE_NAME} ============="
   docker run --rm \
     -v "$(pwd):${CONSTRUCT_ROOT}" -e CONSTRUCT_ROOT \
-    -e TEST_CONDA_MAMBA_BOA_COMPATIBILITY \
     "${DOCKER_ARCH}/${TEST_IMAGE_NAME}" /construct/scripts/test.sh
 done
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -7,7 +7,6 @@ echo "***** Start: Testing Miniforge installer *****"
 export CONDA_PATH="${HOME}/miniforge"
 
 CONSTRUCT_ROOT="${CONSTRUCT_ROOT:-${PWD}}"
-TEST_CONDA_MAMBA_BOA_COMPATIBILITY=${TEST_CONDA_MAMBA_BOA_COMPATIBILITY:-yes}
 
 cd "${CONSTRUCT_ROOT}"
 
@@ -46,7 +45,7 @@ if [[ "$(uname)" == MINGW* ]]; then
   conda.exe install r-base --yes --quiet
   conda.exe list
 
-  if [[ "${INSTALLER_NAME}" == "Mambaforge" ]] && [[ "${TEST_CONDA_MAMBA_BOA_COMPATIBILITY}" == "yes" ]]; then
+  if [[ "${INSTALLER_NAME}" == "Mambaforge" ]]; then
     echo "***** Mambaforge detected. Checking for boa compatibility *****"
     mamba_version_start=$(mamba --version | grep mamba | cut -d ' ' -f 2)
     mamba.exe install boa --yes
@@ -67,7 +66,7 @@ else
   conda info
   conda list
 
-  if [[ "${INSTALLER_NAME}" == "Mambaforge" ]] && [[ "${TEST_CONDA_MAMBA_BOA_COMPATIBILITY}" == "yes" ]]; then
+  if [[ "${INSTALLER_NAME}" == "Mambaforge" ]]; then
     echo "***** Mambaforge detected. Checking for boa compatibility *****"
     implementation=$(python -c "import platform; print(platform.python_implementation().lower())")
     major_minor_version=$(python -c 'import sys; print(f"{sys.version_info[0]}.{sys.version_info[1]}")')