From be2071e985cb417f984ab00a1aad76dee02d6d0b Mon Sep 17 00:00:00 2001 From: Junyoung/Clare Jang Date: Sun, 13 Jun 2021 05:19:43 -0400 Subject: [PATCH] Fix `build` action for macOS (#1916) * Fix GitHub actions for build * Remove resolved comment * Rollback build wrapper version to use GHC 8.10.4 --- .github/workflows/build.yml | 8 ++++---- .github/workflows/test.yml | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ae64e4907b..28a04422c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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) @@ -138,7 +138,7 @@ jobs: fi - name: Upload Wrapper - if: matrix.ghc == '8.10.5' + if: matrix.ghc == '8.10.4' uses: actions/upload-release-asset@v1.0.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -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 }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9637180800..0f82955861 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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