msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

misc small fixes:

Browse Source 
- 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
This commit is contained in:
Inari Listenmaa
2025-08-02 16:42:54 +02:00
parent e81d668605
commit 01c4f82e07
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/build-all-versions.yml vendored
View File

@@ -12,6 +12,7 @@ jobs:
name: ${{ matrix.os }} / ghc ${{ matrix.ghc }} name: ${{ matrix.os }} / ghc ${{ matrix.ghc }}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
fail-fast: false
matrix: matrix:
os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest, macos-latest, windows-latest]
cabal: ["latest"] cabal: ["latest"]
@@ -19,21 +20,26 @@ jobs:
- "8.6.5" - "8.6.5"
- "8.8.3" - "8.8.3"
- "8.10.7" - "8.10.7"
- "9.6.6"
exclude: exclude:
- os: macos-latest - os: macos-latest
ghc: 8.8.3 ghc: 8.8.3
- os: macos-latest - os: macos-latest
ghc: 8.6.5 ghc: 8.6.5
- os: macos-latest
ghc: 8.10.7
- os: windows-latest - os: windows-latest
ghc: 8.8.3 ghc: 8.8.3
- os: windows-latest - os: windows-latest
ghc: 8.6.5 ghc: 8.6.5
- os: windows-latest
ghc: 8.10.7
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
- uses: haskell/actions/setup@v2 - uses: haskell-actions/setup@v2
id: setup-haskell-cabal id: setup-haskell-cabal
name: Setup Haskell name: Setup Haskell
with: with:
@@ -44,7 +50,7 @@ jobs:
run: | run: |
cabal freeze cabal freeze
- uses: actions/cache@v1 - uses: actions/cache@v4
name: Cache ~/.cabal/store name: Cache ~/.cabal/store
with: with:
path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }} path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
@@ -66,14 +72,13 @@ jobs:
strategy: strategy:
matrix: matrix:
stack: ["latest"] stack: ["latest"]
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"] ghc: ["8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.6.6"]
# ghc: ["8.8.3"]
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
- uses: haskell/actions/setup@v2 - uses: haskell-actions/setup@v2
name: Setup Haskell Stack name: Setup Haskell Stack
with: with:
ghc-version: ${{ matrix.ghc }} ghc-version: ${{ matrix.ghc }}
@@ -85,7 +90,7 @@ jobs:
- run: sed -i.bak 's/"C compiler link flags", "/&-no-pie /' /home/runner/.ghcup/ghc/7.10.3/lib/ghc-7.10.3/settings - run: sed -i.bak 's/"C compiler link flags", "/&-no-pie /' /home/runner/.ghcup/ghc/7.10.3/lib/ghc-7.10.3/settings
if: matrix.ghc == '7.10.3' if: matrix.ghc == '7.10.3'
- uses: actions/cache@v1 - uses: actions/cache@v4
name: Cache ~/.stack name: Cache ~/.stack
with: with:
path: ~/.stack path: ~/.stack

4
gf.cabal
View File

@@ -73,7 +73,7 @@ library
build-depends: build-depends:
-- GHC 8.0.2 to GHC 8.10.4 -- GHC 8.0.2 to GHC 8.10.4
array >= 0.5.1 && < 0.6, array >= 0.5.1 && < 0.6,
base >= 4.9.1 && < 4.19 , base >= 4.9.1 && < 4.22,
bytestring >= 0.10.8 && < 0.12, bytestring >= 0.10.8 && < 0.12,
containers >= 0.5.7 && < 0.7, containers >= 0.5.7 && < 0.7,
exceptions >= 0.8.3 && < 0.11, exceptions >= 0.8.3 && < 0.11,
@@ -398,7 +398,7 @@ test-suite gf-tests
main-is: run.hs main-is: run.hs
hs-source-dirs: testsuite hs-source-dirs: testsuite
build-depends: build-depends:
base >= 4.9.1 && < 4.16, base >= 4.9.1,
Cabal >= 1.8, Cabal >= 1.8,
directory >= 1.3.0 && < 1.4, directory >= 1.3.0 && < 1.4,
filepath >= 1.4.1 && < 1.5, filepath >= 1.4.1 && < 1.5,

1
src/runtime/c/configure.ac
View File

@@ -30,6 +30,7 @@ AM_PROG_CC_C_O
-Wall\ -Wall\
-Wextra\ -Wextra\
-Wno-missing-field-initializers\ -Wno-missing-field-initializers\
-fpermissive\
-Wno-unused-parameter\ -Wno-unused-parameter\
-Wno-unused-value" -Wno-unused-value"
fi] fi]