Skip to content

Commit e5dd400

Browse files
committed
CI: bump cabal.yml to GHC 9.6.2 and cabal 3.10.1.0
1 parent 310942f commit e5dd400

File tree

1 file changed

+30
-27
lines changed

1 file changed

+30
-27
lines changed

.github/workflows/cabal.yml

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
ghc: ['9.4.4', '9.2.7', '9.0.2']
18-
cabal: ['3.8.1.0']
17+
ghc: ['9.6.2', '9.4.5', '9.2.8', '9.0.2']
18+
cabal: ['3.10.1.0']
1919
os: [ubuntu-latest]
2020
name: Cabal with GHC ${{ matrix.ghc }}
2121
steps:
2222
- uses: actions/checkout@v3
2323
- name: Setup Haskell
24-
uses: haskell/actions/setup@v2
24+
uses: haskell-actions/setup@v2
2525
with:
2626
ghc-version: ${{ matrix.ghc }}
2727
cabal-version: ${{ matrix.cabal }}
@@ -33,27 +33,30 @@ jobs:
3333
run: cabal test all --enable-tests
3434
- name: Haddock
3535
run: cabal haddock all
36-
build_with_mtl_2_3:
37-
runs-on: ${{ matrix.os }}
38-
strategy:
39-
fail-fast: false
40-
matrix:
41-
ghc: ['9.4.4']
42-
cabal: ['3.8.1.0']
43-
os: [ubuntu-latest]
44-
name: Cabal with GHC ${{ matrix.ghc }} and mtl >= 2.3.1
45-
steps:
46-
- uses: actions/checkout@v3
47-
- name: Setup Haskell
48-
uses: haskell/actions/setup@v2
49-
with:
50-
ghc-version: ${{ matrix.ghc }}
51-
cabal-version: ${{ matrix.cabal }}
52-
- name: Install dependencies
53-
run: sudo apt install -y libbrotli-dev libgd-dev
54-
- name: Build dependencies with mtl >= 2.3.1
55-
# 2022-12-30: 'transformers >= 0.6' is needed because of happstack-server
56-
run: cabal build all --disable-tests --dependencies-only -O0 --constraint 'mtl >= 2.3.1' --constraint 'transformers >= 0.6' --allow-newer='Cabal:mtl' --allow-newer='Cabal:transformers'
57-
- name: Build with mtl >= 2.3.1
58-
# 2022-12-30: 'transformers >= 0.6' is needed because of happstack-server
59-
run: cabal build all --disable-tests -O0 --constraint 'mtl >= 2.3.1' --constraint 'transformers >= 0.6' --allow-newer='Cabal:mtl' --allow-newer='Cabal:transformers'
36+
37+
## Andreas, 2023-08-03: mtl-2.3 is covered by GHC 9.6
38+
#
39+
# build_with_mtl_2_3:
40+
# runs-on: ${{ matrix.os }}
41+
# strategy:
42+
# fail-fast: false
43+
# matrix:
44+
# ghc: ['9.4.4']
45+
# cabal: ['3.8.1.0']
46+
# os: [ubuntu-latest]
47+
# name: Cabal with GHC ${{ matrix.ghc }} and mtl >= 2.3.1
48+
# steps:
49+
# - uses: actions/checkout@v3
50+
# - name: Setup Haskell
51+
# uses: haskell/actions/setup@v2
52+
# with:
53+
# ghc-version: ${{ matrix.ghc }}
54+
# cabal-version: ${{ matrix.cabal }}
55+
# - name: Install dependencies
56+
# run: sudo apt install -y libbrotli-dev libgd-dev
57+
# - name: Build dependencies with mtl >= 2.3.1
58+
# # 2022-12-30: 'transformers >= 0.6' is needed because of happstack-server
59+
# run: cabal build all --disable-tests --dependencies-only -O0 --constraint 'mtl >= 2.3.1' --constraint 'transformers >= 0.6' --allow-newer='Cabal:mtl' --allow-newer='Cabal:transformers'
60+
# - name: Build with mtl >= 2.3.1
61+
# # 2022-12-30: 'transformers >= 0.6' is needed because of happstack-server
62+
# run: cabal build all --disable-tests -O0 --constraint 'mtl >= 2.3.1' --constraint 'transformers >= 0.6' --allow-newer='Cabal:mtl' --allow-newer='Cabal:transformers'

0 commit comments

Comments
 (0)