Skip to content

Commit

Permalink
Fix build action for macOS (#1916)
Browse files Browse the repository at this point in the history
* Fix GitHub actions for build

* Remove resolved comment

* Rollback build wrapper version to use GHC 8.10.4
  • Loading branch information
Ailrun authored Jun 13, 2021
1 parent 7d7c2ef commit be2071e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ jobs:
path: ${{ steps.compress_server_binary.outputs.path }}

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

- name: Compress Wrapper Binary
if: matrix.ghc == '8.10.5'
if: matrix.ghc == '8.10.4'
id: compress_wrapper_binary
run: |
HLS_WRAPPER_BUILD=$(find dist-newstyle \( -name 'hls-wrapper' -o -name 'hls-wrapper.exe' \) -type f)
Expand All @@ -138,7 +138,7 @@ jobs:
fi
- name: Upload Wrapper
if: matrix.ghc == '8.10.5'
if: matrix.ghc == '8.10.4'
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -149,7 +149,7 @@ jobs:
asset_content_type: ${{ steps.compress_wrapper_binary.outputs.content_type}}

- uses: actions/upload-artifact@v2
if: matrix.ghc == '8.10.5'
if: matrix.ghc == '8.10.4'
with:
name: haskell-language-server-wrapper-${{ runner.OS }}${{env.EXE_EXT}}.${{ steps.compress_wrapper_binary.outputs.extension }}
path: ${{ steps.compress_wrapper_binary.outputs.path }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ jobs:
ghc: '8.6.5'
test: true
# only build rest of supported ghc versions for windows
# Disable window test temporarily because choco does not have GHC 8.10.5 yet
- os: windows-latest
ghc: '8.10.5'
test: true
Expand Down

0 comments on commit be2071e

Please sign in to comment.