Skip to content

Commit b174a7f

Browse files
committed
GHC-8.10.7, Cabal-3.4, re-enable sdl
- Bump GHC to 8.10.7 - Bump Cabal to 3.4 - Re-enable sdl for macOS
1 parent 8e002bd commit b174a7f

4 files changed

Lines changed: 6 additions & 9 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@ jobs:
1313
strategy:
1414
matrix:
1515
sys:
16-
# The `sdl2` package is currently not compiling for macOS.
17-
# Reason: unknown.
18-
# Try again with the next GHC release.
19-
- { os: macOS-latest, shell: bash, flags: '-sdl2 glfw'}
16+
- { os: macOS-latest, shell: bash, flags: 'sdl2 glfw'}
2017
- { os: ubuntu-latest, shell: bash, flags: 'sdl2 glfw'}
2118
- { os: windows-latest, shell: 'msys2 {0}', flags: 'sdl2 glfw'}
22-
cabal: ["3.2"]
19+
cabal: ["3.4"]
2320
ghc:
24-
- "8.10.5"
21+
- "8.10.7"
2522

2623
defaults:
2724
run:

‎wgpu-hs/wgpu-hs.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ flag sdl2
2929

3030
common base
3131
default-language: Haskell2010
32-
build-depends: base ^>=4.14.0.0
32+
build-depends: base ^>=4.14.3.0
3333

3434
common ghc-options
3535
ghc-options:

‎wgpu-raw-hs-codegen/wgpu-raw-hs-codegen.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ extra-source-files: CHANGELOG.md
1212

1313
common base
1414
default-language: Haskell2010
15-
build-depends: base ^>=4.14.0.0
15+
build-depends: base ^>=4.14.3.0
1616

1717
common ghc-options
1818
ghc-options:

‎wgpu-raw-hs/wgpu-raw-hs.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ flag sdl2
2727

2828
common base
2929
default-language: Haskell2010
30-
build-depends: base ^>=4.14.0.0
30+
build-depends: base ^>=4.14.3.0
3131

3232
common ghc-options
3333
ghc-options:

0 commit comments

Comments
 (0)