Skip to content

Commit be2071e

Browse files
authored
Fix build action for macOS (#1916)
* Fix GitHub actions for build * Remove resolved comment * Rollback build wrapper version to use GHC 8.10.4
1 parent 7d7c2ef commit be2071e

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ jobs:
115115
path: ${{ steps.compress_server_binary.outputs.path }}
116116

117117
- name: Build Wrapper
118-
if: matrix.ghc == '8.10.5'
118+
if: matrix.ghc == '8.10.4'
119119
run: cabal build exe:hls-wrapper -O2 $LINUX_CABAL_ARGS
120120

121121
- name: Compress Wrapper Binary
122-
if: matrix.ghc == '8.10.5'
122+
if: matrix.ghc == '8.10.4'
123123
id: compress_wrapper_binary
124124
run: |
125125
HLS_WRAPPER_BUILD=$(find dist-newstyle \( -name 'hls-wrapper' -o -name 'hls-wrapper.exe' \) -type f)
@@ -138,7 +138,7 @@ jobs:
138138
fi
139139
140140
- name: Upload Wrapper
141-
if: matrix.ghc == '8.10.5'
141+
if: matrix.ghc == '8.10.4'
142142
uses: actions/[email protected]
143143
env:
144144
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -149,7 +149,7 @@ jobs:
149149
asset_content_type: ${{ steps.compress_wrapper_binary.outputs.content_type}}
150150

151151
- uses: actions/upload-artifact@v2
152-
if: matrix.ghc == '8.10.5'
152+
if: matrix.ghc == '8.10.4'
153153
with:
154154
name: haskell-language-server-wrapper-${{ runner.OS }}${{env.EXE_EXT}}.${{ steps.compress_wrapper_binary.outputs.extension }}
155155
path: ${{ steps.compress_wrapper_binary.outputs.path }}

.github/workflows/test.yml

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
ghc: '8.6.5'
5151
test: true
5252
# only build rest of supported ghc versions for windows
53-
# Disable window test temporarily because choco does not have GHC 8.10.5 yet
5453
- os: windows-latest
5554
ghc: '8.10.5'
5655
test: true

0 commit comments

Comments
 (0)