Skip to content

Commit 048e389

Browse files
committed
Build binaries with agpl flag
Unforutnately, this also invovles vendoring Brittany with a fork that allows it to build on ghc-8.10.1. This is only vendored on the cabal.project file though, not the stack.yamls
1 parent bf94639 commit 048e389

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@ jobs:
5353
echo '::set-env name=LINUX_CABAL_ARGS::--enable-executable-static --ghc-options=-split-sections'
5454
5555
- name: Build Server
56-
# Try building it twice in case of flakey builds on Windows
5756
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
6058
6159
- name: Compress Server Binary
6260
id: compress_server_binary
@@ -95,7 +93,7 @@ jobs:
9593

9694
- name: Build Wrapper
9795
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
9997

10098
- name: Compress Wrapper Binary
10199
if: matrix.ghc == '8.10.1'

cabal.project

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ packages:
22
./
33
ghcide
44

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+
512
tests: true
613

714
package *

0 commit comments

Comments
 (0)