Skip to content

Commit cdf9dc2

Browse files
committed
Make sure hls-wrapper binary comes from GHC-8.10.7
1 parent e453d4b commit cdf9dc2

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

.github/scripts/bindist.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ case "${TARBALL_EXT}" in
2020
)
2121
;;
2222
tar.xz)
23-
GHCS="$(cd "$CI_PROJECT_DIR/out/${ARTIFACT}" && rm -f ./*.json && for ghc in * ; do printf "%s " "$ghc" ; done)"
23+
: "${GHCS:="$(cd "$CI_PROJECT_DIR/out/${ARTIFACT}" && rm -f ./*.json && for ghc in * ; do printf "%s " "$ghc" ; done)"}"
2424
emake --version
2525
emake GHCUP=ghcup ARTIFACT="${ARTIFACT}" GHCS="${GHCS}" bindist
2626
emake GHCUP=ghcup ARTIFACT="${ARTIFACT}" bindist-tar

.github/workflows/release.yaml

+6-3
Original file line numberDiff line numberDiff line change
@@ -438,13 +438,16 @@ jobs:
438438
path: ./
439439

440440
- name: Create bindist
441-
# we need reverse sorting, so that the wrapper binary comes from the oldest GHC always
442441
run: |
443442
set -eux
444-
for bindist in $(find . -mindepth 1 -maxdepth 1 -type f -name 'out-*.tar' -print | sort -r) ; do
445-
tar --overwrite -xf "${bindist}"
443+
for bindist in out-*.tar ; do
444+
tar -xf "${bindist}"
446445
done
447446
unset bindist
447+
# we need to control the order, so the hls wrapper binary is installed
448+
# from the latest version in the list
449+
# TODO: not nice
450+
export GHCS="9.4.4 9.2.7 9.2.5 9.0.2 8.10.7"
448451
bash .github/scripts/bindist.sh
449452
env:
450453
ARTIFACT: ${{ matrix.ARTIFACT }}

0 commit comments

Comments
 (0)