From cfebb2bd5baadf632a4151b49a8345fa38ec4798 Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 16 Jun 2021 16:45:57 +0900 Subject: [PATCH 1/3] Workaround for GHC 8.10.5 on macOS --- .github/workflows/build.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 28a04422c5..584572dba8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,8 +27,6 @@ jobs: ghc: '8.8.3' # fails due to segfault - os: windows-latest ghc: '8.8.2' # fails due to error with Cabal - - os: macOS-latest - ghc: '8.10.5' # https://gitlab.haskell.org/ghc/ghc/-/issues/19968 include: - os: windows-latest ghc: '8.10.2.2' # only available for windows and choco @@ -74,6 +72,14 @@ jobs: run: | echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV + - name: Tentative Workaround for GHC 8.10.5 on macOS + if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5' + env: + GHC_VER: ${{ matrix.ghc }} + run: | + echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)" + sudo rm -rf /Library/Developer/CommandLineTools + - name: Build Server # Try building it twice in case of flakey builds on Windows run: | From af36eff47ca889f9acf713cc18b09ec670db2fc8 Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 16 Jun 2021 16:52:15 +0900 Subject: [PATCH 2/3] Removes unnecessary env specification --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 584572dba8..4fa99e8789 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,8 +74,6 @@ jobs: - name: Tentative Workaround for GHC 8.10.5 on macOS if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5' - env: - GHC_VER: ${{ matrix.ghc }} run: | echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)" sudo rm -rf /Library/Developer/CommandLineTools From 25f0e9af2e36aab6b3c4b5512595d505b510b90b Mon Sep 17 00:00:00 2001 From: Hiromi ISHII Date: Wed, 16 Jun 2021 18:20:28 +0900 Subject: [PATCH 3/3] Also adds workaround to test CI --- .github/workflows/test.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0f82955861..2594638f37 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -65,11 +65,6 @@ jobs: # This build get stuck frequently # - os: windows-latest # ghc: '8.6.4' - exclude: - # Not able to build 'network' package - # See https://gitlab.haskell.org/ghc/ghc/-/issues/19968 - - os: macOS-latest - ghc: '8.10.5' steps: - if: ${{ needs.pre_job.outputs.should_skip != 'true' }} @@ -98,6 +93,12 @@ jobs: echo "CABAL_STORE_DIR=~/.cabal/store" >> $GITHUB_ENV echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV + - name: Tentative Workaround for GHC 8.10.5 on macOS + if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5' + run: | + echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)" + sudo rm -rf /Library/Developer/CommandLineTools + # Needs to be before Cache Cabal so the cache can detect changes to the modified cabal.project file - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.ghc == '9.0.1' }} name: Use modified cabal.project for ghc9