Compare commits

...

2 Commits

Author SHA1 Message Date
834bcfa02c Use FreeBSD 13 in bootstrap script as well 2021-12-02 17:48:56 +01:00
c99ecc0a66 Fix FreeBSD 13 build 2021-12-02 17:48:33 +01:00
2 changed files with 7 additions and 2 deletions

View File

@@ -217,6 +217,9 @@ variables:
- .freebsd13 - .freebsd13
- .root_cleanup - .root_cleanup
before_script: before_script:
- sudo pkg update
- sudo pkg install --yes compat12x-amd64
- sudo ln -s libncurses.so.6 /usr/local/lib/libncurses.so.6.2
- ./.gitlab/before_script/freebsd/install_deps.sh - ./.gitlab/before_script/freebsd/install_deps.sh
.test_ghcup_version:windows: .test_ghcup_version:windows:
@@ -595,6 +598,9 @@ release:freebsd13:
- .release_ghcup - .release_ghcup
- .root_cleanup - .root_cleanup
before_script: before_script:
- sudo pkg update
- sudo pkg install --yes compat12x-amd64
- sudo ln -s libncurses.so.6 /usr/local/lib/libncurses.so.6.2
- ./.gitlab/before_script/freebsd/install_deps.sh - ./.gitlab/before_script/freebsd/install_deps.sh
variables: variables:
ARTIFACT: "x86_64-portbld-freebsd-ghcup" ARTIFACT: "x86_64-portbld-freebsd-ghcup"

View File

@@ -222,8 +222,7 @@ download_ghcup() {
if freebsd-version | grep -E '^12.*' ; then if freebsd-version | grep -E '^12.*' ; then
freebsd_ver=12 freebsd_ver=12
elif freebsd-version | grep -E '^13.*' ; then elif freebsd-version | grep -E '^13.*' ; then
# TODO: missing FreeBSD13 version freebsd_ver=13
freebsd_ver=12
else else
die "Unsupported FreeBSD version! Please report a bug at https://gitlab.haskell.org/haskell/ghcup-hs/-/issues" die "Unsupported FreeBSD version! Please report a bug at https://gitlab.haskell.org/haskell/ghcup-hs/-/issues"
fi fi