WIP

Author: hasufell

.github/scripts/brew.sh

@@ -2,9 +2,6 @@
 
 set -eux
 
-# shellcheck disable=SC1091
-. .github/scripts/env.sh
-
 if [ -e "$HOME/.brew" ] ; then
 	(
 	cd "$HOME/.brew"
@@ -16,10 +13,10 @@ else
 fi
 export PATH="$HOME/.brew/bin:$HOME/.brew/sbin:$PATH"
 
-mkdir -p "$CI_PROJECT_DIR/.brew_cache"
-export HOMEBREW_CACHE="$CI_PROJECT_DIR/.brew_cache"
-mkdir -p "$CI_PROJECT_DIR/.brew_logs"
-export HOMEBREW_LOGS="$CI_PROJECT_DIR/.brew_logs"
+mkdir -p "$GITHUB_WORKSPACE/.brew_cache"
+export HOMEBREW_CACHE="$GITHUB_WORKSPACE/.brew_cache"
+mkdir -p "$GITHUB_WORKSPACE/.brew_logs"
+export HOMEBREW_LOGS="$GITHUB_WORKSPACE/.brew_logs"
 mkdir -p /private/tmp/.brew_tmp
 export HOMEBREW_TEMP=/private/tmp/.brew_tmp
 

.github/scripts/build.sh

@@ -2,27 +2,18 @@
 
 set -eux
 
-# shellcheck disable=SC1091
-. .github/scripts/env.sh
-# shellcheck disable=SC1091
-. .github/scripts/common.sh
-
 uname -a
 uname -p
 uname
 pwd
 env
 
-# ensure ghcup
-install_ghcup
-
 # build
-ghcup install ghc "${GHC_VERSION}"
-ghcup set ghc "${GHC_VERSION}"
+ghcup --no-verbose install ghc --set --install-targets "install_bin install_lib update_package_db" "${GHC_VERSION}"
 sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project
-ecabal update
-ecabal user-config diff
-ecabal user-config init -f
+cabal update
+cabal user-config diff
+cabal user-config init -f
 "ghc-${GHC_VERSION}" --info
 "ghc" --info
 
@@ -40,28 +31,27 @@ args=(
     ${ADD_CABAL_ARGS}
 )
 
-run cabal v2-build "${args[@]}" cabal-install cabal-testsuite
+cabal v2-build "${args[@]}" cabal-install
 
-mkdir -p "$CI_PROJECT_DIR/out"
+mkdir -p "out"
 # shellcheck disable=SC2154
-cp "$(cabal list-bin "${args[@]}" cabal-install:exe:cabal)" "$CI_PROJECT_DIR/out/cabal$ext"
-cp "$(cabal list-bin "${args[@]}" cabal-testsuite:cabal-tests)" "$CI_PROJECT_DIR/out/cabal-tests$ext"
-cp dist-newstyle/cache/plan.json "$CI_PROJECT_DIR/out/plan.json"
-cd "$CI_PROJECT_DIR/out/"
+cp "$(cabal list-bin "${args[@]}" cabal-install:exe:cabal)" "out/cabal$ext"
+cp dist-newstyle/cache/plan.json "out/plan.json"
+cd "out/"
 
 # create tarball/zip
-TARBALL_PREFIX="cabal-install-$("$CI_PROJECT_DIR/out/cabal" --numeric-version)"
+TARBALL_PREFIX="cabal-install-$("./cabal" --numeric-version)"
 case "${TARBALL_EXT}" in
     zip)
-        zip "${TARBALL_PREFIX}-${ARTIFACT}.${TARBALL_EXT}" "cabal${ext}" "cabal-tests${ext}" plan.json
+        zip "${TARBALL_PREFIX}-${ARTIFACT}.${TARBALL_EXT}" "cabal${ext}" plan.json
         ;;
     tar.xz)
-        tar caf "${TARBALL_PREFIX}-${ARTIFACT}.${TARBALL_EXT}" "cabal${ext}" "cabal-tests${ext}" plan.json
+        tar caf "${TARBALL_PREFIX}-${ARTIFACT}.${TARBALL_EXT}" "cabal${ext}" plan.json
         ;;
     *)
         fail "Unknown TARBALL_EXT: ${TARBALL_EXT}"
         ;;
 esac
 
-rm "cabal${ext}" "cabal-tests${ext}" plan.json
+rm "cabal${ext}" plan.json
 

.github/scripts/common.sh

@@ -2,18 +2,17 @@
 
 set -eux
 
-# shellcheck disable=SC1091
-. .github/scripts/env.sh
-# shellcheck disable=SC1091
-. .github/scripts/common.sh
+tar xf ./out/cabal-install-*-"${ARTIFACT}.${TARBALL_EXT}"
 
-uname -a
-uname -p
-uname
-pwd
-env
+ghcup --no-verbose install ghc --set --install-targets "install_bin install_lib update_package_db" "${GHC_VERSION}"
 
-cd "$CI_PROJECT_DIR/out/"
+cabal update
 
-"$(pwd)/cabal-tests$ext" --with-cabal "$(pwd)/cabal$ext"
+# TODO: we want to avoid building here... we should just
+# be using the previously built 'cabal-tests' binary
+cabal run cabal-testsuite:cabal-tests -- \
+  --with-cabal "$(pwd)/cabal" \
+  --intree-cabal-lib "$(pwd)" \
+  --test-tmp "$(pwd)/testdb" \
+  -j "$(nproc)"