Make sure hls-wrapper binary comes from GHC-8.10.7

haskell · Mar 5, 2023 · cdf9dc2 · cdf9dc2
1 parent e453d4b
commit cdf9dc2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/scripts/bindist.sh b/.github/scripts/bindist.sh
@@ -20,7 +20,7 @@ case "${TARBALL_EXT}" in
 		)
         ;;
     tar.xz)
-		GHCS="$(cd "$CI_PROJECT_DIR/out/${ARTIFACT}" && rm -f ./*.json && for ghc in * ; do printf "%s " "$ghc" ; done)"
+		: "${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

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -438,13 +438,16 @@ jobs:
           path: ./
 
       - name: Create bindist
-        # we need reverse sorting, so that the wrapper binary comes from the oldest GHC always
         run: |
           set -eux
-          for bindist in $(find . -mindepth 1 -maxdepth 1 -type f -name 'out-*.tar' -print | sort -r) ; do
-            tar --overwrite -xf "${bindist}"
+          for bindist in out-*.tar ; do
+            tar -xf "${bindist}"
           done
           unset bindist
+          # we need to control the order, so the hls wrapper binary is installed
+          # from the latest version in the list
+          # TODO: not nice
+          export GHCS="9.4.4 9.2.7 9.2.5 9.0.2 8.10.7"
           bash .github/scripts/bindist.sh
         env:
           ARTIFACT: ${{ matrix.ARTIFACT }}