Skip to content

Commit 499f411

Browse files
pepeiborrapepeiborra
authored
Merge branch 'master' into drop-8.6.5
2 parents 0ccfa0f + c422cf3 commit 499f411

File tree

306 files changed

+9209
-6482
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

306 files changed

+9209
-6482
lines changed

‎.github/actions/setup-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ inputs:
77
cabal:
88
description: "Cabal version"
99
required: false
10-
default: "3.6"
10+
default: "3.8.1.0"
1111
os:
1212
description: "Operating system: Linux, Windows or macOS"
1313
required: true

‎.github/workflows/bench.yml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,17 @@ jobs:
6161
with:
6262
ghc: ${{ matrix.ghc }}
6363
os: ${{ runner.os }}
64+
shorten-hls: "false"
6465

6566
# max-backjumps is increased as a temporary solution
6667
# for dependency resolution failure
6768
- run: cabal configure --enable-benchmarks --max-backjumps 12000
6869

6970
- name: Build
70-
run: cabal build ghcide:benchHist
71+
run: cabal build haskell-language-server:benchmark
7172

7273
- name: Bench init
73-
run: cabal bench ghcide:benchHist -j --benchmark-options="all-binaries"
74+
run: cabal bench -j --benchmark-options="all-binaries"
7475

7576
# tar is required to preserve file permissions
7677
# compression speeds up upload/download nicely
@@ -85,14 +86,14 @@ jobs:
8586
- name: Upload workspace
8687
uses: actions/upload-artifact@v3
8788
with:
88-
name: workspace
89+
name: workspace-${{ matrix.ghc }}-${{ matrix.os }}
8990
retention-days: 1
9091
path: workspace.tar.gz
9192

9293
- name: Upload .cabal
9394
uses: actions/upload-artifact@v3
9495
with:
95-
name: cabal-home
96+
name: cabal-home-${{ matrix.ghc }}-${{ matrix.os }}
9697
retention-days: 1
9798
path: ~/.cabal/cabal.tar.gz
9899

@@ -118,13 +119,13 @@ jobs:
118119
- name: Download cabal home
119120
uses: actions/download-artifact@v3
120121
with:
121-
name: cabal-home
122+
name: cabal-home-${{ matrix.ghc }}-${{ matrix.os }}
122123
path: .
123124

124125
- name: Download workspace
125126
uses: actions/download-artifact@v3
126127
with:
127-
name: workspace
128+
name: workspace-${{ matrix.ghc }}-${{ matrix.os }}
128129
path: .
129130

130131
- name: untar
@@ -134,30 +135,30 @@ jobs:
134135
tar xzf cabal.tar.gz --directory ~/.cabal
135136
136137
- name: Bench
137-
run: cabal bench ghcide:benchHist -j --benchmark-options="${{ matrix.example }}"
138+
run: cabal bench -j --benchmark-options="${{ matrix.example }}"
138139

139140
- name: Display results
140141
run: |
141-
column -s, -t < ghcide/bench-results/unprofiled/${{ matrix.example }}/results.csv | tee ghcide/bench-results/unprofiled/${{ matrix.example }}/results.txt
142+
column -s, -t < bench-results/unprofiled/${{ matrix.example }}/results.csv | tee bench-results/unprofiled/${{ matrix.example }}/results.txt
143+
144+
- name: tar benchmarking artifacts
145+
run: find bench-results -name "*.csv" -or -name "*.svg" -or -name "*.html" | xargs tar -czf benchmark-artifacts.tar.gz
142146

143147
- name: Archive benchmarking artifacts
144148
uses: actions/upload-artifact@v3
145149
with:
146-
name: bench-results-${{ runner.os }}-${{ matrix.ghc }}
147-
path: |
148-
ghcide/bench-results/results.*
149-
ghcide/bench-results/**/*.csv
150-
ghcide/bench-results/**/*.svg
151-
ghcide/bench-results/**/*.eventlog.html
150+
name: bench-results-${{ matrix.example }}-${{ runner.os }}-${{ matrix.ghc }}
151+
path: benchmark-artifacts.tar.gz
152+
153+
- name: tar benchmarking logs
154+
# We dont' store the eventlogs because the CI workers risk running out of disk space
155+
run: find bench-results -name "*.log" -or -name "*.hp" | xargs tar -czf benchmark-logs.tar.gz
152156

153157
- name: Archive benchmark logs
154158
uses: actions/upload-artifact@v3
155159
with:
156-
name: bench-logs-${{ runner.os }}-${{ matrix.ghc }}
157-
path: |
158-
ghcide/bench-results/**/*.log
159-
ghcide/bench-results/**/*.eventlog
160-
ghcide/bench-results/**/*.hp
160+
name: bench-logs-${{ matrix.example }}-${{ runner.os }}-${{ matrix.ghc }}
161+
path: benchmark-logs.tar.gz
161162

162163
bench_post_job:
163164
if: always()

‎.github/workflows/pre-commit.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,24 @@ on:
66
branches: [master]
77

88
jobs:
9+
file-diff:
10+
runs-on: ubuntu-latest
11+
outputs:
12+
git-diff: ${{ steps.git-diff.outputs.diff }}
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v3
16+
- name: Find changed files
17+
uses: technote-space/get-diff-action@v6.1.0
18+
id: git-diff
19+
with:
20+
PATTERNS: |
21+
+(src|exe|test|ghcide|plugins|hls-plugin-api|hie-compat|hls-graph|hls-test-utils)/**/*.hs
922
pre-commit:
1023
runs-on: ubuntu-latest
24+
needs: file-diff
1125
steps:
1226
- uses: actions/checkout@v3
13-
1427
- uses: ./.github/actions/setup-build
1528
with:
1629
os: ${{ runner.os }}
@@ -40,3 +53,5 @@ jobs:
4053
4154
- uses: actions/setup-python@v4
4255
- uses: pre-commit/action@v3.0.0
56+
with:
57+
extra_args: --files ${{ needs.file-diff.outputs.git-diff }}

‎.github/workflows/test.yml

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ jobs:
5757
strategy:
5858
fail-fast: true
5959
matrix:
60-
ghc: [ "9.2.4"
60+
ghc: [ "9.4.2"
61+
, "9.4.1"
62+
, "9.2.4"
6163
, "9.2.3"
6264
, "9.0.2"
6365
, "8.10.7"
@@ -68,6 +70,9 @@ jobs:
6870
]
6971
include:
7072
# only test supported ghc major versions
73+
- os: ubuntu-latest
74+
ghc: '9.4.2'
75+
test: true
7176
- os: ubuntu-latest
7277
ghc: '9.2.4'
7378
test: true
@@ -80,6 +85,9 @@ jobs:
8085
- os: ubuntu-latest
8186
ghc: '8.8.4'
8287
test: true
88+
- os: windows-latest
89+
ghc: '9.4.2'
90+
test: true
8391
- os: windows-latest
8492
ghc: '9.2.4'
8593
test: true
@@ -149,47 +157,51 @@ jobs:
149157
HLS_WRAPPER_TEST_EXE: hls-wrapper
150158
run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper"
151159

152-
- if: matrix.test && matrix.ghc != '9.2.4'
160+
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
153161
name: Test hls-brittany-plugin
154162
run: cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="$TEST_OPTS"
155163

156-
- if: matrix.test
164+
- if: matrix.test && matrix.ghc != '9.4.2'
165+
name: Test hls-refactor-plugin
166+
run: cabal test hls-refactor-plugin --test-options="$TEST_OPTS" || cabal test hls-refactor-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-refactor-plugin --test-options="$TEST_OPTS"
167+
168+
- if: matrix.test && matrix.ghc != '9.4.2'
157169
name: Test hls-floskell-plugin
158170
run: cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-floskell-plugin --test-options="$TEST_OPTS"
159171

160-
- if: matrix.test
172+
- if: matrix.test && matrix.ghc != '9.4.2'
161173
name: Test hls-class-plugin
162174
run: cabal test hls-class-plugin --test-options="$TEST_OPTS" || cabal test hls-class-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-class-plugin --test-options="$TEST_OPTS"
163175

164176
- if: matrix.test
165177
name: Test hls-pragmas-plugin
166178
run: cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-pragmas-plugin --test-options="$TEST_OPTS"
167179

168-
- if: matrix.test
180+
- if: matrix.test && matrix.ghc != '9.4.2'
169181
name: Test hls-eval-plugin
170182
run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || cabal test hls-eval-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="$TEST_OPTS"
171183

172-
- if: matrix.test && matrix.ghc != '9.2.4'
184+
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
173185
name: Test hls-haddock-comments-plugin
174186
run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
175187

176-
- if: matrix.test && matrix.ghc != '9.2.4'
188+
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
177189
name: Test hls-splice-plugin
178190
run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="$TEST_OPTS"
179191

180-
- if: matrix.test
192+
- if: matrix.test && matrix.ghc != '9.4.2'
181193
name: Test hls-stylish-haskell-plugin
182194
run: cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS"
183195

184-
- if: matrix.test
196+
- if: matrix.test && matrix.ghc != '9.4.2'
185197
name: Test hls-ormolu-plugin
186198
run: cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || cabal test hls-ormolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-ormolu-plugin --test-options="$TEST_OPTS"
187199

188-
- if: matrix.test
200+
- if: matrix.test && matrix.ghc != '9.4.2'
189201
name: Test hls-fourmolu-plugin
190202
run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
191203

192-
- if: matrix.test && matrix.ghc != '9.2.4'
204+
- if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
193205
name: Test hls-tactics-plugin test suite
194206
run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
195207

@@ -205,15 +217,15 @@ jobs:
205217
name: Test hls-call-hierarchy-plugin test suite
206218
run: cabal test hls-call-hierarchy-plugin --test-options="$TEST_OPTS" || cabal test hls-call-hierarchy-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-call-hierarchy-plugin --test-options="$TEST_OPTS"
207219

208-
- if: matrix.test && matrix.os != 'windows-latest'
220+
- if: matrix.test && matrix.os != 'windows-latest' && matrix.ghc != '9.4.2'
209221
name: Test hls-rename-plugin test suite
210222
run: cabal test hls-rename-plugin --test-options="$TEST_OPTS" || cabal test hls-rename-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-rename-plugin --test-options="$TEST_OPTS"
211223

212-
- if: matrix.test
224+
- if: matrix.test && matrix.ghc != '9.4.2'
213225
name: Test hls-hlint-plugin test suite
214226
run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
215227

216-
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.4'
228+
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.4' && matrix.ghc != '9.4.2'
217229
name: Test hls-stan-plugin test suite
218230
run: cabal test hls-stan-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stan-plugin --test-options="$TEST_OPTS"
219231

@@ -229,15 +241,15 @@ jobs:
229241
name: Test hls-qualify-imported-names-plugin test suite
230242
run: cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS" || cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-qualify-imported-names-plugin --test-options="$TEST_OPTS"
231243

232-
- if: matrix.test
244+
- if: matrix.test && matrix.ghc != '9.4.2'
233245
name: Test hls-code-range-plugin test suite
234246
run: cabal test hls-code-range-plugin --test-options="$TEST_OPTS" || cabal test hls-code-range-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-code-range-plugin --test-options="$TEST_OPTS"
235247

236248
- if: matrix.test
237249
name: Test hls-change-type-signature test suite
238250
run: cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS" || cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS"
239251

240-
- if: matrix.test
252+
- if: matrix.test && matrix.ghc != '9.4.2'
241253
name: Test hls-gadt-plugin test suit
242254
run: cabal test hls-gadt-plugin --test-options="$TEST_OPTS" || cabal test hls-gadt-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-gadt-plugin --test-options="$TEST_OPTS"
243255

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,10 @@ test/testdata/**/hie.yaml
3434
/.direnv/
3535
/.envrc
3636

37-
# ghcide-bench
37+
# bench
3838
*.identifierPosition
3939
/bench/example
40+
/bench-results
4041

4142
# nix
4243
result

‎.gitlab-ci.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ stages:
77
# https://gitlab.haskell.org/haskell/haskell-language-server/-/pipelines
88
variables:
99
# Commit of ghc/ci-images repository from which to pull Docker images
10-
DOCKER_REV: "4ed1a4f27828ba96a34662dc954335e29b470cd2"
10+
DOCKER_REV: "9e4c540d9e4972a36291dfdf81f079f37d748890"
1111

12-
CABAL_INSTALL_VERSION: 3.6.2.0
12+
CABAL_INSTALL_VERSION: 3.8.1.0
1313

1414
.windows_matrix: &windows_matrix
1515
matrix:
@@ -21,6 +21,10 @@ variables:
2121
CABAL_PROJECT: cabal.project
2222
- GHC_VERSION: 9.2.4
2323
CABAL_PROJECT: cabal.project
24+
- GHC_VERSION: 9.4.1
25+
CABAL_PROJECT: cabal.project
26+
- GHC_VERSION: 9.4.2
27+
CABAL_PROJECT: cabal.project
2428

2529
workflow:
2630
rules:
@@ -76,10 +80,10 @@ workflow:
7680
- x86_64-linux
7781
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-centos7:$DOCKER_REV"
7882

79-
.x86_64-linux-fedora27:
83+
.x86_64-linux-fedora33:
8084
tags:
8185
- x86_64-linux
82-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV"
86+
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
8387

8488
.x86_64-linux-alpine:
8589
tags:
@@ -264,35 +268,35 @@ test-x86_64-linux-centos7:
264268
- sudo yum install -y tree
265269

266270
######################
267-
# x86_64 linux fedora27
271+
# x86_64 linux fedora33
268272
######################
269273

270-
build-x86_64-linux-fedora27:
274+
build-x86_64-linux-fedora33:
271275
extends:
272276
- .build
273-
- .x86_64-linux-fedora27
277+
- .x86_64-linux-fedora33
274278
before_script:
275279
- sudo dnf install -y patchelf tree
276280
variables:
277281
ADD_CABAL_ARGS: "--enable-split-sections"
278282

279-
tar-x86_64-linux-fedora27:
283+
tar-x86_64-linux-fedora33:
280284
extends:
281285
- .artifacts
282-
- .x86_64-linux-fedora27
286+
- .x86_64-linux-fedora33
283287
stage: tar
284-
needs: ["build-x86_64-linux-fedora27"]
288+
needs: ["build-x86_64-linux-fedora33"]
285289
script:
286290
- ./.gitlab/tar.sh
287291
variables:
288-
TARBALL_ARCHIVE_SUFFIX: x86_64-fedora27-linux
292+
TARBALL_ARCHIVE_SUFFIX: x86_64-fedora33-linux
289293
TARBALL_EXT: tar.xz
290294

291-
test-x86_64-linux-fedora27:
295+
test-x86_64-linux-fedora33:
292296
extends:
293297
- .test
294-
- .x86_64-linux-fedora27
295-
needs: ["tar-x86_64-linux-fedora27"]
298+
- .x86_64-linux-fedora33
299+
needs: ["tar-x86_64-linux-fedora33"]
296300
before_script:
297301
- sudo dnf install -y tree
298302

‎.gitlab/ci.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ source "$CI_PROJECT_DIR/.gitlab/common.sh"
66

77
export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR/toolchain"
88
export CABAL_DIR="$CI_PROJECT_DIR/cabal"
9-
EXE_EXTENSION = ""
9+
EXE_EXTENSION=""
1010

1111
case "$(uname)" in
1212
MSYS_*|MINGW*)
@@ -50,10 +50,10 @@ esac
5050
case "$(uname)" in
5151
MSYS_*|MINGW*)
5252
# workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196
53-
export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
54-
ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
55-
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
56-
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
53+
# export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
54+
# ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
55+
# cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
56+
# cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
5757
ghc --info
5858
# Shorten binary names
5959
sed -i.bak -e 's/haskell-language-server/hls/g' \
@@ -76,10 +76,11 @@ case "$(uname)" in
7676

7777
mkdir "$CI_PROJECT_DIR/out"
7878

79-
cp "$(cabal list-bin ${args[@]} exe:hls)" "$CI_PROJECT_DIR/out/haskell-language-server-${GHC_VERSION}"$EXE_EXTENSION
80-
cp "$(cabal list-bin ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/haskell-language-server-wrapper"$EXE_EXTENSION
79+
cp "$(cabal list-bin -v0 ${args[@]} exe:hls)" "$CI_PROJECT_DIR/out/haskell-language-server-${GHC_VERSION}"$EXE_EXTENSION
80+
cp "$(cabal list-bin -v0 ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/haskell-language-server-wrapper"$EXE_EXTENSION
8181
;;
8282
*)
83+
sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project
8384
emake --version
8485
emake GHCUP=ghcup hls
8586
emake GHCUP=ghcup bindist

0 commit comments

Comments
 (0)