File tree Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Original file line number Diff line number Diff line change 1
- # Used for ci setup in the gitlab mirror of the project:
1
+ # Used for ci setup in the gitlab mirror of the project:
2
2
# https://gitlab.haskell.org/haskell/haskell-language-server/-/pipelines
3
3
variables :
4
4
# Commit of ghc/ci-images repository from which to pull Docker images
@@ -9,21 +9,17 @@ variables:
9
9
.default_matrix : &default_matrix
10
10
matrix :
11
11
- GHC_VERSION : 8.8.4
12
- CABAL_PROJECT : cabal.project
13
12
- GHC_VERSION : 8.10.7
14
- CABAL_PROJECT : cabal.project
15
13
- GHC_VERSION : 9.0.1
16
- CABAL_PROJECT : cabal-ghc901.project
14
+ LOCAL_CABAL_PROJECT : cabal-ghc901.project.local
17
15
18
16
.m1_matrix : &m1_matrix
19
17
matrix :
20
18
- GHC_VERSION : 8.10.7
21
- CABAL_PROJECT : cabal.project
22
19
23
20
.arm_matrix : &arm_matrix
24
21
matrix :
25
22
- GHC_VERSION : 8.10.7
26
- CABAL_PROJECT : cabal.project
27
23
28
24
29
25
workflow :
@@ -93,7 +89,6 @@ build-aarch64-darwin:
93
89
--keep CI_PROJECT_DIR \
94
90
--keep MACOSX_DEPLOYMENT_TARGET \
95
91
--keep GHC_VERSION \
96
- --keep CABAL_PROJECT \
97
92
--keep CABAL_INSTALL_VERSION \
98
93
--run "$1" 2>&1
99
94
}
Original file line number Diff line number Diff line change @@ -30,6 +30,10 @@ export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=yes
30
30
31
31
curl --proto ' =https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
32
32
33
+ if [[ ! -z " $LOCAL_CABAL_PROJECT " ]]; then
34
+ cp $LOCAL_CABAL_PROJECT cabal.project.local
35
+ fi
36
+
33
37
# some alpines need workaround
34
38
if ghc --info | grep -q integer-simple ; then
35
39
echo -e ' package blaze-textual\n flags: +integer-simple' >> cabal.project.local
You can’t perform that action at this time.
0 commit comments