diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index d5b102670..751b09c7e 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -80,6 +80,7 @@ case "$(uname)" in cp "$(cabal list-bin -v0 ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/haskell-language-server-wrapper"$EXE_EXTENSION ;; *) + sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project emake --version emake GHCUP=ghcup hls emake GHCUP=ghcup bindist diff --git a/cabal.project b/cabal.project index 625fcc827..2a2ee425a 100644 --- a/cabal.project +++ b/cabal.project @@ -65,11 +65,16 @@ constraints: -- This is benign and won't affect our ability to release to Hackage, -- because we only depend on `ekg-json` when a non-default flag -- is turned on. +-- DELETE MARKER FOR CI +-- centos7 has an old version of git which cabal doesn't +-- support. We delete these lines in gitlab ci to workaround +-- this issue, as this is not necessary to build our binaries. source-repository-package type:git location: https://github.com/pepeiborra/ekg-json tag: 7a0af7a8fd38045fd15fb13445bdcc7085325460 -- https://github.com/tibbe/ekg-json/pull/12 +-- END DELETE allow-newer: -- ghc-9.4