diff --git a/scripts/test.sh b/scripts/test.sh index 26b82d38..acec55d1 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -17,7 +17,9 @@ if [[ "$(uname)" == MINGW* ]]; then else EXT="sh"; fi +echo finding installer INSTALLER_PATH=$(find build/ -name "*forge*.${EXT}" | head -n 1) +echo found ${INSTALLER_PATH} INSTALLER_NAME=$(basename "${INSTALLER_PATH}" | cut -d "-" -f 1) INSTALLER_EXE=$(basename "${INSTALLER_PATH}") @@ -46,18 +48,13 @@ if [[ "$(uname)" == MINGW* ]]; then conda.exe install r-base --yes --quiet conda.exe list - # hmaarrfk -- 2023/02 - # For some reason the Mambaforge-Linux-ppc64le works fine in under 15 mins on a branch - # but then fails to build within the 6 hour time limit on the release CI. - if [[ "${INSTALLER_EXE}" != "*-Linux-ppc64le.sh" ]]; then - echo "***** Checking for boa compatibility *****" - mamba_version_start=$(mamba --version | grep mamba | cut -d ' ' -f 2) - mamba.exe install boa --yes - mamba_version_end=$(mamba --version | grep mamba | cut -d ' ' -f 2) - if [[ "${mamba_version_start}" != "${mamba_version_end}" ]]; then - echo "mamba version changed from ${mamba_version_start} to ${mamba_version_end}" - exit 1 - fi + echo "***** Checking for boa compatibility *****" + mamba_version_start=$(mamba --version | grep mamba | cut -d ' ' -f 2) + mamba.exe install boa --yes + mamba_version_end=$(mamba --version | grep mamba | cut -d ' ' -f 2) + if [[ "${mamba_version_start}" != "${mamba_version_end}" ]]; then + echo "mamba version changed from ${mamba_version_start} to ${mamba_version_end}" + exit 1 fi else # Test one of our installers in batch mode