File tree 2 files changed +5
-4
lines changed
2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,9 @@ case "${TARBALL_EXT}" in
20
20
)
21
21
;;
22
22
tar.xz)
23
- GHCS=" $( cd " $CI_PROJECT_DIR /out/${ARTIFACT} " && rm -f ./* .json && for ghc in * ; do printf " %s " " $ghc " ; done)"
23
+ # we need to control the order, so the hls wrapper binary is installed
24
+ # from the oldest version in the list
25
+ : " ${GHCS:= " $( cd " $CI_PROJECT_DIR /out/${ARTIFACT} " && rm -f ./* .json && for ghc in * ; do printf " %s\n" " $ghc " ; done | sort -r | tr ' \n' ' ' ) " } "
24
26
emake --version
25
27
emake GHCUP=ghcup ARTIFACT=" ${ARTIFACT} " GHCS=" ${GHCS} " bindist
26
28
emake GHCUP=ghcup ARTIFACT=" ${ARTIFACT} " bindist-tar
Original file line number Diff line number Diff line change @@ -438,11 +438,10 @@ jobs:
438
438
path : ./
439
439
440
440
- name : Create bindist
441
- # we need reverse sorting, so that the wrapper binary comes from the oldest GHC always
442
441
run : |
443
442
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}"
446
445
done
447
446
unset bindist
448
447
bash .github/scripts/bindist.sh
You can’t perform that action at this time.
0 commit comments