Parallelize GHC builds

Author: hasufell

.cirrus.yml

@@ -6,7 +6,6 @@ compute_engine_instance:
   disk: 100 # Gb
 
 build_task:
-  name: build
   timeout_in: 120m
   only_if: $CIRRUS_TAG != ''
   env:
@@ -20,59 +19,83 @@ build_task:
     RUNNER_OS: "FreeBSD"
     ADD_CABAL_ARGS: "--enable-split-sections"
     GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
+    CABAL_CACHE_NONFATAL: "yes"
+  matrix:
+    - name: build-ghc-8.10.7
+      env:
+        GHC_VERSION: 8.10.7
+    - name: build-ghc-9.0.2
+      env:
+        GHC_VERSION: 9.0.2
+    - name: build-ghc-9.2.5
+      env:
+        GHC_VERSION: 9.2.5
   install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree
   script:
     - tzsetup Etc/GMT
     - adjkerntz -a
     - bash .github/scripts/build.sh
-    - bash .github/scripts/test.sh
-      # binaries_cache: &binaries_cache
-      #   folder: out
-      #   fingerprint_script:
-      #     - ghc --numeric-version
-      #     - cat cabal.project
-      #     - cat haskell-language-server.cabal
-      #     - cat dist-newstyle/cache/plan.json
+    - tar caf out.tar.xz out/ store/
   binaries_artifacts:
-    path: "out/*"
+    path: "out.tar.xz"
+
+
+bindist_task:
+  name: bindist
+  depends_on:
+    - build-ghc-8.10.7
+    - build-ghc-9.0.2
+    - build-ghc-9.2.5
+  timeout_in: 120m
+  only_if: $CIRRUS_TAG != ''
+  env:
+    TARBALL_EXT: "tar.xz"
+    ARCH: 64
+    ARTIFACT: "x86_64-freebsd"
+    DISTRO: "na"
+    RUNNER_OS: "FreeBSD"
+    GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
+  install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree unzip
+  script:
+    - tzsetup Etc/GMT
+    - adjkerntz -a
+
+    - curl -o binaries-8.10.7.tar.xz -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/build-ghc-8.10.7/binaries/out.tar.xz
+    - tar xvf binaries-8.10.7.tar.xz
+    - rm -f binaries-8.10.7.tar.xz
+
+    - curl -o binaries-9.0.2.tar.xz -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/build-ghc-9.0.2/binaries/out.tar.xz
+    - tar xvf binaries-9.0.2.tar.xz
+    - rm -f binaries-9.0.2.tar.xz
+
+    - curl -o binaries-9.2.5.tar.xz -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/build-ghc-9.2.5/binaries/out.tar.xz
+    - tar xvf binaries-9.2.5.tar.xz
+    - rm -f binaries-9.2.5.tar.xz
+
+    - bash .github/scripts/bindist.sh
+  bindist_artifacts:
+    path: "./out/*.tar.xz"
+
+test_task:
+  name: test
+  depends_on:
+    - bindist
+  timeout_in: 120m
+  only_if: $CIRRUS_TAG != ''
+  env:
+    TARBALL_EXT: "tar.xz"
+    ARCH: 64
+    ARTIFACT: "x86_64-freebsd"
+    DISTRO: "na"
+    RUNNER_OS: "FreeBSD"
+    GITHUB_WORKSPACE: ${CIRRUS_WORKING_DIR}
+  install_script: pkg install -y hs-cabal-install git bash misc/compat10x misc/compat11x misc/compat12x gmake patchelf tree unzip
+  script:
+    - tzsetup Etc/GMT
+    - adjkerntz -a
+
+    - curl -O -L https://api.cirrus-ci.com/v1/artifact/build/${CIRRUS_BUILD_ID}/bindist/bindist.zip
+    - unzip bindist.zip
+
+    - bash .github/scripts/test.sh
 
-    # release_task:
-    #   name: "Release"
-    #   only_if: $CIRRUS_TAG != ''
-    #   depends_on: build
-    #   env:
-    #     GITHUB_TOKEN: ENCRYPTED[9d9b54424cb18abc9067436c729a77e0486805eff1903bc5b2c591696850f8db7cebac3f29cfa3b119ebb6fd2e98a839]
-    #   install_script: pkg install -y curl bash jq
-    #   binaries_cache: *binaries_cache
-    #   upload_script: |
-    #     #!/bin/bash
-    #
-    #     if [[ "$CIRRUS_RELEASE" == "" ]]; then
-    #       NUM_TRIES=0
-    #       until [ $NUM_TRIES -eq 20 ]
-    #       do
-    #         echo "Retrying to find a release associated with this tag"
-    #         CIRRUS_RELEASE=$(curl -sL https://api.github.com/repos/$CIRRUS_REPO_FULL_NAME/releases/tags/$CIRRUS_TAG | jq -r '.id')
-    #         [[ "$CIRRUS_RELEASE" != "null" ]] && break
-    #         NUM_TRIES=$((NUM_TRIES+1))
-    #         sleep 30
-    #       done
-    #     fi
-    #
-    #     if [[ "$GITHUB_TOKEN" == "" ]]; then
-    #       echo "Please provide GitHub access token via GITHUB_TOKEN environment variable!"
-    #       exit 1
-    #     fi
-    #
-    #     for fpath in out/*
-    #     do
-    #       echo "Uploading $fpath..."
-    #       name=$(basename "$fpath")
-    #       url_to_upload="https://uploads.github.com/repos/$CIRRUS_REPO_FULL_NAME/releases/$CIRRUS_RELEASE/assets?name=$name"
-    #       echo "Uploading to $url_to_upload"
-    #       curl -X POST \
-    #         --data-binary @$fpath \
-    #         --header "Authorization: token $GITHUB_TOKEN" \
-    #         --header "Content-Type: application/x-xz-compressed-tar" \
-    #         $url_to_upload
-    #     done

.github/scripts/bindist.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -eux
+
+. .github/scripts/env.sh
+. .github/scripts/common.sh
+
+# ensure ghcup
+if ! command -v ghcup ; then
+	install_ghcup
+fi
+
+# create tarball/zip
+case "${TARBALL_EXT}" in
+    zip)
+		HLS_VERSION="$(grep '^version:' haskell-language-server.cabal | awk '{ print $2 }')"
+		(
+			cd "$CI_PROJECT_DIR/out/${ARTIFACT}"
+			zip "$CI_PROJECT_DIR/out/haskell-language-server-${HLS_VERSION}-${ARTIFACT}.zip" haskell-language-server-*
+		)
+        ;;
+    tar.xz)
+		GHCS="$(cd "$CI_PROJECT_DIR/out/${ARTIFACT}" && rm -f ./*.json && for ghc in * ; do printf "%s " "$ghc" ; done)"
+		emake --version
+		emake GHCUP=ghcup ARTIFACT="${ARTIFACT}" GHCS="${GHCS}" bindist
+		emake GHCUP=ghcup ARTIFACT="${ARTIFACT}"                bindist-tar
+		emake GHCUP=ghcup                        GHCS="${GHCS}" clean-ghcs
+        ;;
+    *)
+        fail "Unknown TARBALL_EXT: ${TARBALL_EXT}"
+        ;;
+esac

.github/scripts/brew.sh

@@ -22,6 +22,6 @@ export HOMEBREW_LOGS=$CI_PROJECT_DIR/.brew_logs
 mkdir -p /private/tmp/.brew_tmp
 export HOMEBREW_TEMP=/private/tmp/.brew_tmp
 
-brew update
+#brew update
 brew install ${1+"$@"}
 

.github/scripts/build.sh

@@ -22,75 +22,40 @@ download_cabal_cache "$HOME/.local/bin/cabal-cache"
 
 # build
 ecabal update
+ghcup install ghc "${GHC_VERSION}"
+ghcup set ghc "${GHC_VERSION}"
+"ghc-${GHC_VERSION}" --info
+"ghc" --info
 
-mkdir -p "$CI_PROJECT_DIR/plan.json"
-mkdir -p "$CI_PROJECT_DIR/out"
+mkdir -p "$CI_PROJECT_DIR/out/${ARTIFACT}"
+mkdir -p "$CI_PROJECT_DIR/out/plan.json"
 
 case "$(uname)" in
     MSYS_*|MINGW*)
-		for ghc in $(cat bindist/ghcs-Msys) ; do
-			GHC_VERSION="$(echo "${ghc}" | tr -d '\r')"
-			args=( -O2 -w "ghc-$GHC_VERSION" --project-file cabal.project --disable-profiling --disable-tests --enable-executable-stripping ${ADD_CABAL_ARGS})
-			ghcup install ghc "${GHC_VERSION}"
-			ghcup set ghc "${GHC_VERSION}"
-			"ghc-${GHC_VERSION}" --info
-			"ghc" --info
-			# Shorten binary names
-			# due to MAX_PATH issues on windows
-			sed -i.bak -e 's/haskell-language-server/hls/g' \
-				   -e 's/haskell_language_server/hls/g' \
-				   haskell-language-server.cabal cabal.project
-			sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
-				   src/**/*.hs exe/*.hs
-
-
-			# shellcheck disable=SC2068
-			build_with_cache ${args[@]} exe:hls exe:hls-wrapper
-			cp dist-newstyle/cache/plan.json "$CI_PROJECT_DIR/plan.json/${ARTIFACT}-ghc-${GHC_VERSION}-plan.json"
-
-			# shellcheck disable=SC2068
-			cp "$(cabal list-bin -v0 ${args[@]} exe:hls)" "$CI_PROJECT_DIR/out/haskell-language-server-${GHC_VERSION}"${ext}
-			# shellcheck disable=SC2068
-			cp "$(cabal list-bin -v0 ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/haskell-language-server-wrapper"${ext}
-			ghcup rm ghc "${GHC_VERSION}"
-		done
+		args=( -O2 -w "ghc-$GHC_VERSION" --project-file cabal.project --disable-profiling --disable-tests --enable-executable-stripping ${ADD_CABAL_ARGS})
+
+		# Shorten binary names
+		# due to MAX_PATH issues on windows
+		sed -i.bak -e 's/haskell-language-server/hls/g' \
+			   -e 's/haskell_language_server/hls/g' \
+			   haskell-language-server.cabal cabal.project
+		sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
+			   src/**/*.hs exe/*.hs
+
+		# shellcheck disable=SC2068
+		build_with_cache ${args[@]} exe:hls exe:hls-wrapper
+		cp dist-newstyle/cache/plan.json "$CI_PROJECT_DIR/out/plan.json/${ARTIFACT}-ghc-${GHC_VERSION}-plan.json"
+
+		# shellcheck disable=SC2068
+		cp "$(cabal list-bin -v0 ${args[@]} exe:hls)" "$CI_PROJECT_DIR/out/${ARTIFACT}/haskell-language-server-${GHC_VERSION}${ext}"
+		# shellcheck disable=SC2068
+		cp "$(cabal list-bin -v0 ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/${ARTIFACT}/haskell-language-server-wrapper${ext}"
         ;;
 	*)
 		sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project
 		emake --version
-		emake GHCUP=ghcup CABAL_CACHE_BIN=cabal-cache.sh S3_HOST="${S3_HOST}" S3_KEY="${ARTIFACT}" hls
-		emake GHCUP=ghcup bindist
-		(
-		cd out/
-		for pj in *plan.json ; do
-			mv "${pj}" "$CI_PROJECT_DIR/plan.json/${ARTIFACT}-${pj}"
-		done
-		)
-		rm -rf out/*.*.*
+		emake GHCUP=ghcup CABAL_CACHE_BIN=cabal-cache.sh S3_HOST="${S3_HOST}" S3_KEY="${ARTIFACT}" GHC_VERSION="${GHC_VERSION}" hls-ghc
         ;;
 esac
 
-# create tarball/zip
-TARBALL_PREFIX="haskell-language-server"
-case "${TARBALL_EXT}" in
-    zip)
-		HLS_VERSION="$("$CI_PROJECT_DIR/out/haskell-language-server-wrapper" --numeric-version)"
-		(
-			cd "$CI_PROJECT_DIR/out/"
-			zip "${TARBALL_PREFIX}-${HLS_VERSION}-${ARTIFACT}.zip" haskell-language-server-*
-			find . -mindepth 1 -maxdepth 1 \! -name '*.zip' -exec rm -rf '{}' \;
-		)
-        ;;
-    tar.xz)
-		emake --version
-		HLS_VERSION="$(emake -s -C out/bindist/haskell-language-server-* version)"
-		emake TARBALL="${TARBALL_PREFIX}-${HLS_VERSION}-${ARTIFACT}.tar.xz" bindist-tar
-		emake GHCUP=ghcup clean-ghcs
-		find out -mindepth 1 -maxdepth 1 \! -name '*.tar.xz' -exec rm -rf '{}' \;
-        ;;
-    *)
-        fail "Unknown TARBALL_EXT: ${TARBALL_EXT}"
-        ;;
-esac
 
-mv "$CI_PROJECT_DIR"/plan.json/* out/

.github/scripts/cabal-cache.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 case "$(uname -s)" in
 	MSYS_*|MINGW*)
@@ -9,11 +9,12 @@ case "$(uname -s)" in
 	   ;;
 esac
 
-if [ -n "${CABAL_CACHE_DISABLE}" ] ; then
+if [ "${CABAL_CACHE_DISABLE}" = "yes" ] ; then
 	echo "cabal-cache disabled (CABAL_CACHE_DISABLE set)"
-elif [ -n "${CABAL_CACHE_NONFATAL}" ] ; then
-	"cabal-cache${ext}" "$@" || echo "cabal-cache failed (CABAL_CACHE_NONFATAL set)"
+elif [ "${CABAL_CACHE_NONFATAL}" = "yes" ] ; then
+	time "cabal-cache${ext}" "$@" || echo "cabal-cache failed (CABAL_CACHE_NONFATAL set)"
 else
-	exec "cabal-cache${ext}" "$@"
+	time "cabal-cache${ext}" "$@"
+	exit $?
 fi
 

.github/scripts/common.sh

@@ -139,7 +139,6 @@ install_ghcup() {
 	else
 		curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_MINIMAL=1 sh
 		source "$(dirname "${GHCUP_BIN}")/env"
-		ghcup install ghc --set "${BOOTSTRAP_HASKELL_GHC_VERSION}"
 		ghcup install cabal --set "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
 	fi
 }

.github/scripts/env.sh

@@ -11,7 +11,6 @@ fi
 export PATH="$HOME/.local/bin:$PATH"
 
 export BOOTSTRAP_HASKELL_NONINTERACTIVE=1
-export BOOTSTRAP_HASKELL_GHC_VERSION="${GHC_VER:-recommended}"
 export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-recommended}"
 export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=yes
 export BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes

.github/scripts/tar.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -eux
+
+. .github/scripts/env.sh
+
+ls -lah
+ls -lah out/
+ls -lah store/
+
+tar cvf "out-${ARTIFACT}-${GHC_VERSION}.tar" out/ store/

.github/scripts/untar.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -eux
+
+for bindist in out-*.tar ; do
+	tar xf "${bindist}"
+done