Make sure hls-wrapper binary comes from GHC-8.10.7

haskell · Mar 6, 2023 · 3a5d5de · 3a5d5de
1 parent e453d4b
commit 3a5d5de
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/scripts/bindist.sh b/.github/scripts/bindist.sh
@@ -20,7 +20,9 @@ case "${TARBALL_EXT}" in
 		)
         ;;
     tar.xz)
-		GHCS="$(cd "$CI_PROJECT_DIR/out/${ARTIFACT}" && rm -f ./*.json && for ghc in * ; do printf "%s " "$ghc" ; done)"
+		# we need to control the order, so the hls wrapper binary is installed
+		# from the oldest version in the list
+		: "${GHCS:="$(cd "$CI_PROJECT_DIR/out/${ARTIFACT}" && rm -f ./*.json && for ghc in * ; do printf "%s\n" "$ghc" ; done | sort -r | tr '\n' ' ')"}"
 		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,11 +438,10 @@ 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
           bash .github/scripts/bindist.sh