Skip to content

Commit 01c4f82

Browse files
committed
misc small fixes:
- update actions/cache to v4 - update haskell/actions/setup to haskell-actions/setup - stack doesn't support ghc < 8.4, remove from CI - don't fail immediately - add -fpermissive flag to gcc - only build 9.6.6 with macos and windows latest - bump base upper bound
1 parent e81d668 commit 01c4f82

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

.github/workflows/build-all-versions.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,34 @@ jobs:
1212
name: ${{ matrix.os }} / ghc ${{ matrix.ghc }}
1313
runs-on: ${{ matrix.os }}
1414
strategy:
15+
fail-fast: false
1516
matrix:
1617
os: [ubuntu-latest, macos-latest, windows-latest]
1718
cabal: ["latest"]
1819
ghc:
1920
- "8.6.5"
2021
- "8.8.3"
2122
- "8.10.7"
23+
- "9.6.6"
2224
exclude:
2325
- os: macos-latest
2426
ghc: 8.8.3
2527
- os: macos-latest
2628
ghc: 8.6.5
29+
- os: macos-latest
30+
ghc: 8.10.7
2731
- os: windows-latest
2832
ghc: 8.8.3
2933
- os: windows-latest
3034
ghc: 8.6.5
35+
- os: windows-latest
36+
ghc: 8.10.7
3137

3238
steps:
3339
- uses: actions/checkout@v2
3440
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
3541

36-
- uses: haskell/actions/setup@v2
42+
- uses: haskell-actions/setup@v2
3743
id: setup-haskell-cabal
3844
name: Setup Haskell
3945
with:
@@ -44,7 +50,7 @@ jobs:
4450
run: |
4551
cabal freeze
4652
47-
- uses: actions/cache@v1
53+
- uses: actions/cache@v4
4854
name: Cache ~/.cabal/store
4955
with:
5056
path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
@@ -66,14 +72,13 @@ jobs:
6672
strategy:
6773
matrix:
6874
stack: ["latest"]
69-
ghc: ["7.10.3","8.0.2", "8.2.2", "8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2"]
70-
# ghc: ["8.8.3"]
75+
ghc: ["8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.6.6"]
7176

7277
steps:
7378
- uses: actions/checkout@v2
7479
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
7580

76-
- uses: haskell/actions/setup@v2
81+
- uses: haskell-actions/setup@v2
7782
name: Setup Haskell Stack
7883
with:
7984
ghc-version: ${{ matrix.ghc }}
@@ -85,7 +90,7 @@ jobs:
8590
- run: sed -i.bak 's/"C compiler link flags", "/&-no-pie /' /home/runner/.ghcup/ghc/7.10.3/lib/ghc-7.10.3/settings
8691
if: matrix.ghc == '7.10.3'
8792

88-
- uses: actions/cache@v1
93+
- uses: actions/cache@v4
8994
name: Cache ~/.stack
9095
with:
9196
path: ~/.stack

gf.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ library
7373
build-depends:
7474
-- GHC 8.0.2 to GHC 8.10.4
7575
array >= 0.5.1 && < 0.6,
76-
base >= 4.9.1 && < 4.19 ,
76+
base >= 4.9.1 && < 4.22,
7777
bytestring >= 0.10.8 && < 0.12,
7878
containers >= 0.5.7 && < 0.7,
7979
exceptions >= 0.8.3 && < 0.11,
@@ -398,7 +398,7 @@ test-suite gf-tests
398398
main-is: run.hs
399399
hs-source-dirs: testsuite
400400
build-depends:
401-
base >= 4.9.1 && < 4.16,
401+
base >= 4.9.1,
402402
Cabal >= 1.8,
403403
directory >= 1.3.0 && < 1.4,
404404
filepath >= 1.4.1 && < 1.5,

src/runtime/c/configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ AM_PROG_CC_C_O
3030
-Wall\
3131
-Wextra\
3232
-Wno-missing-field-initializers\
33+
-fpermissive\
3334
-Wno-unused-parameter\
3435
-Wno-unused-value"
3536
fi]

0 commit comments

Comments
 (0)