From c859b3ee2b71dd30db9d1ac572270e4a449f0153 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 11 Feb 2022 19:24:39 +0100 Subject: [PATCH] Exclude FreeBSD from 'ghcup run' test --- .gitlab/script/ghcup_version.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitlab/script/ghcup_version.sh b/.gitlab/script/ghcup_version.sh index 3a10140..3cdab04 100755 --- a/.gitlab/script/ghcup_version.sh +++ b/.gitlab/script/ghcup_version.sh @@ -107,17 +107,19 @@ eghcup set cabal ${CABAL_VERSION} [ `$(eghcup whereis cabal ${CABAL_VERSION}) --numeric-version` = "${CABAL_VERSION}" ] [ `eghcup run --cabal ${CABAL_VERSION} -- cabal --numeric-version` = "${CABAL_VERSION}" ] -if [ "${ARCH}" = "64" ] ; then - eghcup run --ghc 8.10.7 --cabal 3.4.1.0 --hls 1.6.1.0 --stack 2.7.3 --install --bindir "$(pwd)/.bin" - if [ "${OS}" == "WINDOWS" ] ; then - expected=$(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghcup-run.files.windows" | sort) - else - expected=$(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghcup-run.files" | sort) +if [ "${OS}" != "FREEBSD" ] ; then + if [ "${ARCH}" = "64" ] ; then + eghcup run --ghc 8.10.7 --cabal 3.4.1.0 --hls 1.6.1.0 --stack 2.7.3 --install --bindir "$(pwd)/.bin" + if [ "${OS}" == "WINDOWS" ] ; then + expected=$(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghcup-run.files.windows" | sort) + else + expected=$(cat "$( cd "$(dirname "$0")" ; pwd -P )/../ghcup-run.files" | sort) + fi + actual=$(cd ".bin" && find . | sort) + [ "${actual}" = "${expected}" ] + unset actual expected + rm -rf .bin fi - actual=$(cd ".bin" && find . | sort) - [ "${actual}" = "${expected}" ] - unset actual expected - rm -rf .bin fi cabal --version