File tree 4 files changed +13
-11
lines changed
4 files changed +13
-11
lines changed Original file line number Diff line number Diff line change 53
53
echo '::set-env name=LINUX_CABAL_ARGS::--enable-executable-static --ghc-options=-split-sections'
54
54
55
55
- name : Build Server
56
- # Try building it twice in case of flakey builds on Windows
57
56
run : |
58
- cabal build exe:hls -O2 $LINUX_CABAL_ARGS || \
59
- cabal build exe:hls -O2 $LINUX_CABAL_ARGS -j1
57
+ cabal build exe:hls -O2 -fagpl $LINUX_CABAL_ARGS
60
58
61
59
- name : Compress Server Binary
62
60
id : compress_server_binary
95
93
96
94
- name : Build Wrapper
97
95
if : matrix.ghc == '8.10.1'
98
- run : cabal build exe:hls-wrapper -O2 $LINUX_CABAL_ARGS
96
+ run : cabal build exe:hls-wrapper -O2 -fagpl $LINUX_CABAL_ARGS
99
97
100
98
- name : Compress Wrapper Binary
101
99
if : matrix.ghc == '8.10.1'
Original file line number Diff line number Diff line change @@ -2,6 +2,13 @@ packages:
2
2
./
3
3
ghcide
4
4
5
+ source-repository-package
6
+ type : git
7
+ location : https://github.com/infinity0/brittany.git
8
+ tag : 0807fc9b30eb9758dffdb87d2a9a9fa6a17a62b1
9
+
10
+ allow-newer : data-tree-print :base
11
+
5
12
tests : true
6
13
7
14
package *
Original file line number Diff line number Diff line change @@ -108,9 +108,7 @@ idePlugins includeExamples = pluginDescToIdePlugins allPlugins
108
108
, StylishHaskell. descriptor " stylish-haskell"
109
109
, Retrie. descriptor " retrie"
110
110
#if AGPL
111
- #if !MIN_VERSION_ghc(8,10,1)
112
111
, Brittany. descriptor " brittany"
113
- #endif
114
112
#endif
115
113
, Eval. descriptor " eval"
116
114
]
Original file line number Diff line number Diff line change @@ -101,11 +101,10 @@ library
101
101
else
102
102
build-depends : unix
103
103
if flag(agpl)
104
- if impl(ghc < 8.10 )
105
- build-depends :
106
- brittany
107
- exposed-modules :
108
- Ide.Plugin.Brittany
104
+ build-depends :
105
+ brittany
106
+ exposed-modules :
107
+ Ide.Plugin.Brittany
109
108
110
109
ghc-options :
111
110
-Wall
You can’t perform that action at this time.
0 commit comments