Skip to content

Commit 96dc126

Browse files
committed
Use local project file in gitlab ci
1 parent 57d3c74 commit 96dc126

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Used for ci setup in the gitlab mirror of the project:
1+
# Used for ci setup in the gitlab mirror of the project:
22
# https://gitlab.haskell.org/haskell/haskell-language-server/-/pipelines
33
variables:
44
# Commit of ghc/ci-images repository from which to pull Docker images
@@ -9,21 +9,17 @@ variables:
99
.default_matrix: &default_matrix
1010
matrix:
1111
- GHC_VERSION: 8.8.4
12-
CABAL_PROJECT: cabal.project
1312
- GHC_VERSION: 8.10.7
14-
CABAL_PROJECT: cabal.project
1513
- GHC_VERSION: 9.0.1
16-
CABAL_PROJECT: cabal-ghc901.project
14+
LOCAL_CABAL_PROJECT: cabal-ghc901.project.local
1715

1816
.m1_matrix: &m1_matrix
1917
matrix:
2018
- GHC_VERSION: 8.10.7
21-
CABAL_PROJECT: cabal.project
2219

2320
.arm_matrix: &arm_matrix
2421
matrix:
2522
- GHC_VERSION: 8.10.7
26-
CABAL_PROJECT: cabal.project
2723

2824

2925
workflow:
@@ -93,7 +89,6 @@ build-aarch64-darwin:
9389
--keep CI_PROJECT_DIR \
9490
--keep MACOSX_DEPLOYMENT_TARGET \
9591
--keep GHC_VERSION \
96-
--keep CABAL_PROJECT \
9792
--keep CABAL_INSTALL_VERSION \
9893
--run "$1" 2>&1
9994
}

.gitlab/ci.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=yes
3030

3131
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
3232

33+
if [[ ! -z "$LOCAL_CABAL_PROJECT" ]]; then
34+
cp $LOCAL_CABAL_PROJECT cabal.project.local
35+
fi
36+
3337
# some alpines need workaround
3438
if ghc --info | grep -q integer-simple ; then
3539
echo -e 'package blaze-textual\n flags: +integer-simple' >> cabal.project.local

0 commit comments

Comments
 (0)