Skip to content

Commit 38cd642

Browse files
committed
CI: remove GHC 8.10.5 from builds
Since HLS 1.6 would not support this version - this check can be removed.
1 parent 9bfc97b commit 38cd642

File tree

3 files changed

+3
-23
lines changed

3 files changed

+3
-23
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
ghc: ['9.0.1', '8.10.7', '8.10.6', '8.10.5', '8.8.4', '8.8.3', '8.6.5']
21+
ghc: ['9.0.1', '8.10.7', '8.10.6', '8.8.4', '8.8.3', '8.6.5']
2222
os: [ubuntu-18.04, macOS-latest, windows-latest]
2323
exclude:
2424
- os: windows-latest
@@ -68,12 +68,6 @@ jobs:
6868
run: |
6969
echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV
7070
71-
- name: Workaround for GHC 8.10.5 on macOS
72-
if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
73-
run: |
74-
echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
75-
sudo rm -rf /Library/Developer/CommandLineTools
76-
7771
- name: Modify cabal.project to workaround segfaults for ghc-8.8.4 and windows
7872
if: matrix.ghc == '8.8.4' && matrix.os == 'windows-latest'
7973
run: |

.github/workflows/cache-deps.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.10.5", "8.8.4", "8.8.3", "8.6.5"]
32+
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.8.3", "8.6.5"]
3333
os: [ubuntu-latest, macOS-latest, windows-latest]
3434
exclude:
3535
- os: windows-latest
@@ -56,12 +56,6 @@ jobs:
5656
run: |
5757
echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
5858
59-
- if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
60-
name: Workaround for GHC 8.10.5 on macOS
61-
run: |
62-
echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
63-
sudo rm -rf /Library/Developer/CommandLineTools
64-
6559
# Needs to be before Cache Cabal so the cache can detect changes to the modified cabal.project file
6660
- if: matrix.ghc == '9.0.1'
6761
name: Use modified cabal.project for ghc9

.github/workflows/test.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
strategy:
4141
fail-fast: true
4242
matrix:
43-
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.10.5", "8.8.4", "8.8.3", "8.6.5"]
43+
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.8.3", "8.6.5"]
4444
os: [ubuntu-latest, macOS-latest]
4545
include:
4646
# only test supported ghc major versions
@@ -68,8 +68,6 @@ jobs:
6868
# only build rest of supported ghc versions for windows
6969
- os: windows-latest
7070
ghc: '8.10.6'
71-
- os: windows-latest
72-
ghc: '8.10.5'
7371
- os: windows-latest
7472
ghc: '8.8.4'
7573

@@ -97,12 +95,6 @@ jobs:
9795
run: |
9896
echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
9997
100-
- if: matrix.os == 'macOS-latest' && matrix.ghc == '8.10.5'
101-
name: Workaround for GHC 8.10.5 on macOS
102-
run: |
103-
echo "# uninstalling CommandLineTools (see https://github.com/haskell/haskell-language-server/issues/1913#issuecomment-861667786)"
104-
sudo rm -rf /Library/Developer/CommandLineTools
105-
10698
# Needs to be before Cache Cabal so the cache can detect changes to the modified cabal.project file
10799
- if: matrix.ghc == '9.0.1'
108100
name: Use modified cabal.project for ghc9

0 commit comments

Comments
 (0)