Skip to content

Commit ed67f2c

Browse files
authored
Apply workaround for 8.8.4 and windows (#2199)
to enable it in ci (test and build)
1 parent ea032ce commit ed67f2c

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

.github/workflows/build.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
exclude:
2222
- os: windows-latest
2323
ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550
24-
- os: windows-latest
25-
ghc: '8.8.4' # also fails due to segfault :(
2624
- os: windows-latest
2725
ghc: '8.8.3' # fails due to segfault
2826
include:
@@ -81,6 +79,12 @@ jobs:
8179
echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
8280
sudo rm -rf /Library/Developer/CommandLineTools
8381
82+
- name: Modify cabal.project to workaround segfaults for ghc-8.8.4 and windows
83+
if: matrix.ghc == '8.8.4' && matrix.os == 'windows-latest'
84+
run: |
85+
echo "package floskell" >> cabal.project
86+
echo " ghc-options: -O0" >> cabal.project
87+
8488
- name: Build Server
8589
# Try building it twice in case of flakey builds on Windows
8690
run: |

.github/workflows/test.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,12 @@ jobs:
6767
ghc: '8.10.4'
6868
- os: windows-latest
6969
ghc: '8.10.3'
70+
- os: windows-latest
71+
ghc: '8.8.4'
7072
# These builds get stuck frequently
7173
# - os: windows-latest
7274
# ghc: '8.10.2.2'
73-
75+
7476
# - os: windows-latest
7577
# ghc: '8.6.4'
7678

@@ -101,7 +103,7 @@ jobs:
101103
echo "CABAL_STORE_DIR=~/.cabal/store" >> $GITHUB_ENV
102104
echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
103105
104-
- name: Tentative Workaround for GHC 8.10.5 on macOS
106+
- name: Workaround for GHC 8.10.5 on macOS
105107
if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
106108
run: |
107109
echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
@@ -112,6 +114,12 @@ jobs:
112114
name: Use modified cabal.project for ghc9
113115
run: cp cabal-ghc901.project cabal.project
114116

117+
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.ghc == '8.8.4' && matrix.os == 'windows-latest' }}
118+
name: Modify cabal.project to workaround segfaults for ghc-8.8.4 and windows
119+
run: |
120+
echo "package floskell" >> cabal.project
121+
echo " ghc-options: -O0" >> cabal.project
122+
115123
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
116124
name: Cache Cabal
117125
uses: actions/cache@v2

0 commit comments

Comments
 (0)