haskell · hasufell · Dec 11, 2022 · Nov 22, 2022
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -12,6 +12,8 @@ task:
     GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
     JSON_VERSION: "0.0.7"
     CIRRUS_CLONE_SUBMODULES: true
+    AWS_ACCESS_KEY_ID: ENCRYPTED[3e99c4ac040871f213abd616ec66952d954dc289cdd97772f88e58a74d08a2250133437780fe98b7aedf7ef1fb32f5eb]
+    AWS_SECRET_ACCESS_KEY: ENCRYPTED[5910cfd77a922ff7fc06eeb6a6b9f79d4867863e541f06eb2c4cfecae0613650e3e0588373fa8d9249d295d76cf9cb3b]
   install_script: pkg install -y ghc hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake
   script:
     - bash .github/scripts/build.sh

diff --git a/.github/scripts/build.sh b/.github/scripts/build.sh
@@ -3,60 +3,78 @@
 set -eux
 
 . .github/scripts/prereq.sh
+. .github/scripts/common.sh
 
-if ! command -v ghcup && [ "${RUNNER_OS}" != "FreeBSD" ] ; then
-	find "$GHCUP_INSTALL_BASE_PREFIX"
-	mkdir -p "$GHCUP_BIN"
-	mkdir -p "$GHCUP_BIN"/../cache
-	curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 sh
+
+# ensure ghcup
+if ! command -v ghcup ; then
+	install_ghcup
+fi
+
+# ensure cabal-cache
+if ! cabal-cache version ; then
+	download_cabal_cache "$HOME/.local/bin/cabal-cache"
 fi
 
+# ensure ghc
 if [ "${RUNNER_OS}" != "FreeBSD" ] ; then
-	ghcup install ghc --set --isolate="$HOME/.local"     --force "$GHC_VER"
-	ghcup install cabal     --isolate="$HOME/.local/bin" --force "$CABAL_VER"
+	if [ "${DISTRO}" != "Debian" ] ; then # ! armv7 or aarch64 linux
+		if ! "ghc-${GHC_VER}" --numeric-version ; then
+			ghcup -v install ghc --set --force "$GHC_VER"
+		fi
+		if [ "$(cabal --numeric-version || true)" != "${CABAL_VER}" ] ; then
+			ghcup -v install cabal --force "$CABAL_VER"
+		fi
+		ghc --version
+		cabal --version
+		GHC="ghc-${GHC_VER}"
+	else
+		if [ "$(cabal --numeric-version || true)" != "${CABAL_VER}" ] ; then
+			ghcup -v install cabal --force "$CABAL_VER"
+		fi
+		cabal --version
+		GHC="ghc"
+	fi
+else
 	ghc --version
 	cabal --version
-	GHC="ghc-${GHC_VER}"
-else
 	GHC="ghc"
 fi
 
-git describe --all
+git_describe
 
-ecabal() {
-	cabal "$@"
-}
 
 # build
 ecabal update
 
+if ! cabal-cache version ; then
+	build_cabal_cache "$HOME/.local/bin"
+fi
 
 if [ "${RUNNER_OS}" = "Linux" ] ; then
 	if [ "${ARCH}" = "32" ] ; then
-		ecabal build -w "${GHC}" --ghc-options='-split-sections -optl-static' -ftui
+		build_with_cache -w "${GHC}" --ghc-options='-split-sections -optl-static' -ftui --enable-tests
 	elif [ "${ARCH}" = "64" ] ; then
-		ecabal build -w "${GHC}" --ghc-options='-split-sections -optl-static' -ftui
+		build_with_cache -w "${GHC}" --ghc-options='-split-sections -optl-static' -ftui --enable-tests
 	else
-		ecabal build -w "${GHC}" -ftui
+		build_with_cache -w "${GHC}" -ftui --enable-tests
 	fi
 elif [ "${RUNNER_OS}" = "FreeBSD" ] ; then
-	ecabal build -w "${GHC}" --ghc-options='-split-sections' --constraint="zlib +bundled-c-zlib" --constraint="zip +disable-zstd" -ftui
+	build_with_cache -w "${GHC}" --ghc-options='-split-sections' --constraint="zlib +bundled-c-zlib" --constraint="zip +disable-zstd" -ftui --enable-tests
 elif [ "${RUNNER_OS}" = "Windows" ] ; then
-	ecabal build -w "${GHC}" --constraint="zlib +bundled-c-zlib" --constraint="lzma +static"
+	build_with_cache -w "${GHC}" --constraint="zlib +bundled-c-zlib" --constraint="lzma +static" --enable-tests
 else
-	ecabal build -w "${GHC}" --constraint="zlib +bundled-c-zlib" --constraint="lzma +static" -ftui
+	build_with_cache -w "${GHC}" --constraint="zlib +bundled-c-zlib" --constraint="lzma +static" -ftui --enable-tests
 fi
 
-mkdir out
-binary=$(ecabal new-exec -w "${GHC}" --verbose=0 --offline sh -- -c 'command -v ghcup')
+
+# set up artifacts
+mkdir -p out
+binary=$(cabal list-bin ghcup)
+binary_test=$(cabal list-bin ghcup-test)
 ver=$("${binary}" --numeric-version)
-if [ "${RUNNER_OS}" = "macOS" ] ; then
-	strip "${binary}"
-else
-	if [ "${RUNNER_OS}" != "Windows" ] ; then
-		strip -s "${binary}"
-	fi
-fi
+strip_binary "${binary}"
 cp "${binary}" "out/${ARTIFACT}-${ver}"
+cp "${binary_test}" "out/test-${ARTIFACT}-${ver}"
 cp ./dist-newstyle/cache/plan.json "out/${ARTIFACT}.plan.json"
 
diff --git a/.github/scripts/common.sh b/.github/scripts/common.sh
@@ -0,0 +1,187 @@
+#!/bin/sh
+
+if [ "${RUNNER_OS}" = "Windows" ] ; then
+	ext=".exe"
+else
+	ext=''
+fi
+
+ecabal() {
+	cabal "$@"
+}
+
+sync_from() {
+	if [ "${RUNNER_OS}" != "Windows" ] ; then
+		cabal_store_path="$(dirname "$(cabal help user-config | tail -n 1 | xargs)")/store"
+	fi
+
+	cabal-cache sync-from-archive \
+		--host-name-override=s3.us-west-004.backblazeb2.com \
+		--host-port-override=443 \
+		--host-ssl-override=True \
+		--region us-west-2 \
+		$([ "${RUNNER_OS}" != "Windows" ] && echo --store-path="$cabal_store_path") \
+		--archive-uri "s3://ghcup-hs/${RUNNER_OS}-${ARCH}-${DISTRO}"
+}
+
+sync_to() {
+	if [ "${RUNNER_OS}" != "Windows" ] ; then
+		cabal_store_path="$(dirname "$(cabal help user-config | tail -n 1 | xargs)")/store"
+	fi
+
+	cabal-cache sync-to-archive \
+		--host-name-override=s3.us-west-004.backblazeb2.com \
+		--host-port-override=443 \
+		--host-ssl-override=True \
+		--region us-west-2 \
+		$([ "${RUNNER_OS}" != "Windows" ] && echo --store-path="$cabal_store_path") \
+		--archive-uri "s3://ghcup-hs/${RUNNER_OS}-${ARCH}-${DISTRO}"
+}
+
+raw_eghcup() {
+	"$GHCUP_BIN/ghcup${ext}" -v -c "$@"
+}
+
+eghcup() {
+	if [ "${OS}" = "Windows" ] ; then
+		"$GHCUP_BIN/ghcup${ext}" -c -s "file:/$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$@"
+	else
+		"$GHCUP_BIN/ghcup${ext}" -c -s "file://$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml" "$@"
+	fi
+}
+
+sha_sum() {
+	if [ "${OS}" = "FreeBSD" ] ; then
+		sha256 "$@"
+	else
+		sha256sum "$@"
+	fi
+
+}
+
+git_describe() {
+	git config --global --get-all safe.directory | grep '^\*$' || git config --global --add safe.directory "*"
+	git describe --always
+}
+
+download_cabal_cache() {
+	(
+	set -e
+	dest="$HOME/.local/bin/cabal-cache"
+    url=""
+	exe=""
+	cd /tmp
+	case "${RUNNER_OS}" in
+		"Linux")
+			case "${DISTRO}" in
+				"Alpine")
+					case "${ARCH}" in
+						"32") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/1.0.5.1/i386-linux-alpine-cabal-cache-1.0.5.1
+							;;
+						"64") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/1.0.5.1/x86_64-linux-alpine-cabal-cache-1.0.5.1
+							;;
+					esac
+					;;
+				*)
+					case "${ARCH}" in
+						"64") url=https://github.com/haskell-works/cabal-cache/releases/download/v1.0.5.1/cabal-cache-x86_64-linux.gz
+							;;
+						"ARM64") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/1.0.5.1/aarch64-linux-cabal-cache-1.0.5.1
+							;;
+						"ARM") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/1.0.5.1/armv7-linux-cabal-cache-1.0.5.1
+							;;
+					esac
+					;;
+			esac
+			;;
+		"FreeBSD")
+			;;
+		"Windows")
+			exe=".exe"
+			url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/1.0.5.1/x86_64-mingw64-cabal-cache-1.0.5.1.exe
+			;;
+		"macOS")
+			case "${ARCH}" in
+				"ARM64") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/1.0.5.1/aarch64-apple-darwin-cabal-cache-1.0.5.1
+					;;
+				"64") url=https://downloads.haskell.org/~ghcup/unofficial-bindists/cabal-cache/1.0.5.1/x86_64-apple-darwin-cabal-cache-1.0.5.1
+					;;
+			esac
+			;;
+	esac
+
+	if [ -n "${url}" ] ; then
+		case "${url##*.}" in
+			"gz")
+				curl -L -o - "${url}" | gunzip > cabal-cache${exe}
+				;;
+			*)
+				curl -o cabal-cache${exe} -L "${url}"
+				;;
+		esac
+		chmod +x cabal-cache${exe}
+		cp "cabal-cache${exe}" "${dest}${exe}"
+	fi
+    )
+}
+
+build_cabal_cache() {
+	(
+	set -e
+	GHC_CABAL_CACHE=ghc-8.10.7
+	dest="$1"
+
+	if [ "${GHC_CABAL_CACHE}" != "ghc" ] && [ "${GHC_CABAL_CACHE}" != "ghc-${GHC_VER}" ] ; then
+		if ! ${GHC_CABAL_CACHE} --numeric-version ; then
+			ghcup -v install ghc --force ${GHC_CABAL_CACHE#ghc-}
+		fi
+	fi
+
+	cd /tmp
+	ecabal install -w "${GHC_CABAL_CACHE}" --overwrite-policy=always --install-method=copy --installdir="$dest" cabal-cache
+	mkdir -p "${CI_PROJECT_DIR}/out"
+	cp "$dest/cabal-cache" "${CI_PROJECT_DIR}/out/cabal-cache-${RUNNER_OS}-${DISTRO}-${ARCH}"
+
+	if [ "${GHC_CABAL_CACHE}" != "ghc" ] && [ "${GHC_CABAL_CACHE}" != "ghc-${GHC_VER}" ] ; then
+		ghcup -v rm ghc ${GHC_CABAL_CACHE#ghc-}
+	fi
+	)
+}
+
+build_with_cache() {
+	ecabal configure "$@"
+	ecabal build --dependencies-only "$@" --dry-run
+	sync_from
+	ecabal build --dependencies-only "$@" || sync_to
+	sync_to
+	ecabal build "$@"
+	sync_to
+}
+
+install_ghcup() {
+	find "$GHCUP_INSTALL_BASE_PREFIX"
+	mkdir -p "$GHCUP_BIN"
+	mkdir -p "$GHCUP_BIN"/../cache
+
+	if [ "${RUNNER_OS}" = "FreeBSD" ] ; then
+		curl -o ghcup https://downloads.haskell.org/ghcup/tmp/x86_64-portbld-freebsd-ghcup-0.1.18.1
+		chmod +x ghcup
+		mv ghcup "$HOME/.local/bin/ghcup"
+	else
+		curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_MINIMAL=1 sh
+	fi
+}
+
+strip_binary() {
+	(
+	set -e
+	binary=$1
+	if [ "${RUNNER_OS}" = "macOS" ] ; then
+		strip "${binary}"
+	else
+		if [ "${RUNNER_OS}" != "Windows" ] ; then
+			strip -s "${binary}"
+		fi
+	fi
+	)
+}
diff --git a/.github/scripts/hls.sh b/.github/scripts/hls.sh
@@ -3,35 +3,13 @@
 set -eux
 
 . .github/scripts/prereq.sh
+. .github/scripts/common.sh
 
 mkdir -p "$CI_PROJECT_DIR"/.local/bin
 
 ### build
 
-ecabal() {
-	cabal "$@"
-}
 
-raw_eghcup() {
-	"$GHCUP_BIN/ghcup${ext}" -v -c "$@"
-}
-
-eghcup() {
-	if [ "${OS}" = "Windows" ] ; then
-		"$GHCUP_BIN/ghcup${ext}" -v -c -s file:/$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml "$@"
-	else
-		"$GHCUP_BIN/ghcup${ext}" -v -c -s file://$CI_PROJECT_DIR/data/metadata/ghcup-${JSON_VERSION}.yaml "$@"
-	fi
-}
-
-sha_sum() {
-	if [ "${OS}" = "FreeBSD" ] ; then
-		sha256 "$@"
-	else
-		sha256sum "$@"
-	fi
-
-}
 
 if [ "${OS}" = "Windows" ] ; then
 	GHCUP_DIR="${GHCUP_INSTALL_BASE_PREFIX}"/ghcup
@@ -42,11 +20,6 @@ fi
 rm -rf "${GHCUP_DIR}"
 mkdir -p "${GHCUP_BIN}"
 
-if [ "${OS}" = "Windows" ] ; then
-	ext=".exe"
-else
-	ext=''
-fi
 ls -lah out
 find out
 cp "out/${ARTIFACT}"-* "$GHCUP_BIN/ghcup${ext}"
@@ -58,18 +31,41 @@ eghcup --version
 sha_sum "$GHCUP_BIN/ghcup${ext}"
 sha_sum "$(raw_eghcup --offline whereis ghcup)"
 
-git describe --always
+git_describe
 
 eghcup install ghc "${GHC_VERSION}"
 eghcup install cabal
 
 ecabal update
 
-eghcup debug-info
+if ! command -v cabal-cache ; then
+	download_cabal_cache "$HOME/.local/bin/cabal-cache"
+fi
+
+if ! cabal-cache version ; then
+	build_cabal_cache "$HOME/.local/bin"
+fi
+
 
-eghcup compile hls -j $(nproc) -g ${HLS_TARGET_VERSION} --ghc ${GHC_VERSION}
+eghcup debug-info
 
-[ `$(eghcup whereis hls ${HLS_TARGET_VERSION}) --numeric-version` = "${HLS_TARGET_VERSION}" ] || [ `$(eghcup whereis hls ${HLS_TARGET_VERSION}) --numeric-version | sed 's/.0$//'` = "${HLS_TARGET_VERSION}" ]
+(
+	cd /tmp
+	git clone --depth 1 --branch "${HLS_TARGET_VERSION}" \
+		https://github.com/haskell/haskell-language-server.git \
+		"haskell-language-server-${HLS_TARGET_VERSION}"
+	cd "haskell-language-server-${HLS_TARGET_VERSION}/"
+	ecabal configure -w "ghc-${GHC_VERSION}" --disable-profiling --disable-tests --jobs="$(nproc)"
+	ecabal build --dependencies-only -w "ghc-${GHC_VERSION}" --disable-profiling --disable-tests --jobs="$(nproc)" --dry-run
+	sync_from
+	ecabal build --dependencies-only -w "ghc-${GHC_VERSION}" --disable-profiling --disable-tests --jobs="$(nproc)" || sync_to
+	sync_to
+)
+
+eghcup -v compile hls -j "$(nproc)" -g "${HLS_TARGET_VERSION}" --ghc "${GHC_VERSION}"
+
+[ "$($(eghcup whereis hls "${HLS_TARGET_VERSION}") --numeric-version)" = "${HLS_TARGET_VERSION}" ] ||
+	[ "$($(eghcup whereis hls "${HLS_TARGET_VERSION}") --numeric-version | sed 's/.0$//')" = "${HLS_TARGET_VERSION}" ]
 
 # nuke
 eghcup nuke