Skip to content

Commit 889d4f7

Browse files
committed
haskell-language-server => hls on CI
I hate that I have to do this
1 parent 4feadad commit 889d4f7

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,22 @@ jobs:
3131
# with:
3232
# path: ~/.cabal
3333
# key: ${{ runner.OS }}-${{ matrix.ghc }}-cabal-0
34+
35+
- name: Shorten binary names
36+
# if: ${{ runner.OS == Windows }}
37+
shell: bash
38+
run: sed -i -e 's/executable haskell-language-server/executable hls' haskell-language-server.cabal
3439

3540
- run: cabal build floskell -v2
3641

3742
- name: Build Server
38-
run: cabal build exe:haskell-language-server -O2 --disable-documentation -fdist-binary
43+
run: cabal build exe:hls -O2 --disable-documentation -fdist-binary
3944

4045
- name: Find Server Binary
4146
id: find_server_binary
4247
shell: bash
4348
run: |
44-
HLS=$(find dist-newstyle \( -name 'haskell-language-server' -o -name 'haskell-language-server.exe' \) -type f)
49+
HLS=$(find dist-newstyle \( -name 'hls' -o -name 'hls.exe' \) -type f)
4550
echo ::set-output name=hls_binary::$HLS
4651
4752
- name: Upload Server Binary

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@ shake.yaml.lock
2121

2222
# ignore hie.yaml's for testdata
2323
test/**/*.yaml
24+
25+
# macOS folder metadata
26+
.DS_Store

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ source-repository-package
1616
source-repository-package
1717
type: git
1818
location: https://github.com/bubba/hie-bios.git
19-
tag: 6df34cb7df3d380a2ef245d4fe54c18ce6874f48
19+
tag: 12f4f2f050a643ee360b197789250f0d96d003ff
2020

2121
tests: true
2222
documentation: true

haskell-language-server.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ executable haskell-language-server
177177
, unordered-containers
178178
default-language: Haskell2010
179179

180-
executable hls-wrapper
180+
executable haskell-language-server-wrapper
181181
import: cpp-flags
182182
main-is: Wrapper.hs
183183
hs-source-dirs:

0 commit comments

Comments
 (0)