Skip to content

Add ghc 9.2.1 to gitlab ci #2636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ variables:
CABAL_INSTALL_VERSION: 3.6.2.0

.default_matrix: &default_matrix
matrix:
- GHC_VERSION: 8.8.4
CABAL_PROJECT: cabal.project
- GHC_VERSION: 8.10.7
CABAL_PROJECT: cabal.project
- GHC_VERSION: 9.0.2
CABAL_PROJECT: cabal-ghc90.project
- GHC_VERSION: 9.2.1
CABAL_PROJECT: cabal-ghc921.project

# ghc-9.2.1 is broken for bsd
.freebsd_matrix: &freebsd_matrix
matrix:
- GHC_VERSION: 8.8.4
CABAL_PROJECT: cabal.project
Expand Down Expand Up @@ -148,9 +160,9 @@ build-x86_64-freebsd12:
extends: .build
tags:
- x86_64-freebsd12
parallel: *default_matrix
parallel: *freebsd_matrix
variables:
ADD_CABAL_ARGS: "--enable-split-sections"
ADD_CABAL_ARGS: "--enable-split-sections -j1"

tar-x86_64-freebsd12:
extends: .artifacts
Expand All @@ -168,13 +180,13 @@ build-x86_64-freebsd13:
extends: .build
tags:
- x86_64-freebsd13
parallel: *default_matrix
parallel: *freebsd_matrix
before_script:
- sudo pkg update
- sudo pkg install --yes compat12x-amd64
- sudo ln -s libncurses.so.6 /usr/local/lib/libncurses.so.6.2
variables:
ADD_CABAL_ARGS: "--enable-split-sections"
ADD_CABAL_ARGS: "--enable-split-sections -j1"

tar-x86_64-freebsd13:
extends: .artifacts
Expand Down
9 changes: 2 additions & 7 deletions .gitlab/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ case "$(uname -s)" in
;;
esac

# some alpines need workaround
if ghc --info | grep -q integer-simple ; then
echo -e 'package blaze-textual\n flags: +integer-simple' >> cabal.project.local
fi

# Shorten binary names
sed -i.bak -e 's/haskell-language-server/hls/g' \
-e 's/haskell_language_server/hls/g' \
Expand All @@ -58,9 +53,9 @@ sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
src/**/*.hs exe/*.hs

args=(
-O2
-O2
-w "ghc-$GHC_VERSION"
--project-file "$CABAL_PROJECT"
--project-file "$CABAL_PROJECT"
--disable-profiling
--disable-tests
--enable-executable-stripping
Expand Down
90 changes: 0 additions & 90 deletions .gitlab/shell-aarch64-darwin.nix

This file was deleted.