Skip to content

Commit 3a3ae6f

Browse files
committed
github actions: updated GHC & cabal
1 parent a78d142 commit 3a3ae6f

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/haskell.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
ghc: ["8.10.7", "9.2.2", "9.4.3"]
13+
ghc: ["8.10.7", "9.2.7", "9.4.4"]
1414
os: [ubuntu-latest, macos-latest, windows-latest]
1515

16+
env:
17+
CABAL_VERSION: "3.8.1.0"
18+
1619
defaults:
1720
run:
1821
shell: ${{ matrix.os == 'windows-latest' && 'msys2 {0}' || 'bash' }}
@@ -42,7 +45,7 @@ jobs:
4245
id: setup-haskell
4346
with:
4447
ghc-version: ${{ matrix.ghc }}
45-
cabal-version: 3.6.2.0
48+
cabal-version: ${{ env.CABAL_VERSION }}
4649

4750
- name: "WIN: Setup Haskell"
4851
id: win-setup-haskell
@@ -54,7 +57,7 @@ jobs:
5457
BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=1 \
5558
BOOTSTRAP_HASKELL_ADJUST_BASHRC=1 \
5659
BOOTSTRAP_HASKELL_GHC_VERSION="${{ matrix.ghc }}" \
57-
BOOTSTRAP_HASKELL_CABAL_VERSION="3.6.2.0" \
60+
BOOTSTRAP_HASKELL_CABAL_VERSION="${{ env.CABAL_VERSION }}" \
5861
sh
5962
6063
# MSYS2 doesn't inherit $GITHUB_PATH so this is needed
@@ -129,7 +132,6 @@ jobs:
129132
- name: Set cache version
130133
run: |
131134
echo "CACHE_VERSION=hi5eTh3A" >> $GITHUB_ENV
132-
echo "STYLISH_HASKELL_VERSION=0.14.3.0" >> $GITHUB_ENV
133135
134136
- name: "Install build environment (apt-get)"
135137
run: |
@@ -141,7 +143,7 @@ jobs:
141143
id: setup-haskell
142144
with:
143145
ghc-version: 8.10.7
144-
cabal-version: 3.6.2.0
146+
cabal-version: 3.8.1.0
145147

146148
- name: "Setup cabal bin path"
147149
run: |

0 commit comments

Comments
 (0)