Skip to content

Commit 8551b57

Browse files
committed
Update CI
1 parent a4c6423 commit 8551b57

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

.github/workflows/haskell.yml

+18-9
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,24 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
ghc: ["9.2.2", "9.0.2", "8.10.7", "8.8.4", "8.6.5"]
21-
os: [ubuntu-latest, windows-latest]
20+
ghc: ["9.8.1", "9.6.3", "9.4.8", "9.2.8", "9.0.2", "8.10.7"]
21+
os: [ubuntu-latest, macOS-latest, windows-latest]
22+
exclude:
23+
- os: windows-latest
24+
ghc: "9.4.2"
25+
26+
env:
27+
# Modify this value to "invalidate" the cabal cache.
28+
CABAL_CACHE_VERSION: "2024-01-05"
2229

2330
steps:
2431
- uses: actions/checkout@v2
2532

26-
- uses: haskell/actions/setup@v1
33+
- uses: haskell-actions/setup@v2
2734
id: setup-haskell
2835
with:
2936
ghc-version: ${{ matrix.ghc }}
30-
cabal-version: 3.6.2.0
37+
cabal-version: '3.10.2.1'
3138

3239
- name: Set some window specific things
3340
if: matrix.os == 'windows-latest'
@@ -36,9 +43,11 @@ jobs:
3643
- name: Configure project
3744
run: |
3845
cabal configure --enable-tests --enable-benchmarks --write-ghc-environment-files=ghc8.4.4+
39-
# APPEND=1 ./scripts/gen-cabal-project-local.sh
40-
# echo "cabal.project.local:"
41-
# cat cabal.project.local
46+
cat >> cabal.project.local <<EOF
47+
package bits-extra
48+
flags: +bmi2
49+
EOF
50+
cabal build all --enable-tests --enable-benchmarks --dry-run
4251
4352
- name: Cabal cache over S3
4453
uses: action-works/cabal-cache-s3@v1
@@ -50,7 +59,7 @@ jobs:
5059
dist-dir: dist-newstyle
5160
store-path: ${{ steps.setup-haskell.outputs.cabal-store }}
5261
threads: 16
53-
archive-uri: ${{ secrets.BINARY_CACHE_URI }}
62+
archive-uri: ${{ secrets.BINARY_CACHE_URI }}/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
5463
skip: "${{ secrets.BINARY_CACHE_URI == '' }}"
5564

5665
- name: Cabal cache over HTTPS
@@ -59,7 +68,7 @@ jobs:
5968
dist-dir: dist-newstyle
6069
store-path: ${{ steps.setup-haskell.outputs.cabal-store }}
6170
threads: 16
62-
archive-uri: https://cache.haskellworks.io/archive
71+
archive-uri: https://cache.haskellworks.io/${{ env.CABAL_CACHE_VERSION }}/${{ runner.os }}/${{ matrix.cabal }}/${{ matrix.ghc }}
6372
skip: "${{ secrets.BINARY_CACHE_URI != '' }}"
6473

6574
- name: Build

hw-simd.cabal

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ maintainer: [email protected]
1212
copyright: 2018-2021 John Ky
1313
license: BSD-3-Clause
1414
license-file: LICENSE
15-
tested-with: GHC == 9.2.2, GHC == 9.0.2, GHC == 8.10.7, GHC == 8.8.4, GHC == 8.6.5
15+
tested-with: GHC == 9.8.1, GHC == 9.6.3, GHC == 9.4.8, GHC == 9.2.8, GHC == 9.0.2
1616
build-type: Simple
1717
extra-source-files: README.md
1818
ChangeLog.md
@@ -41,15 +41,15 @@ flag sse42
4141
common base { build-depends: base >= 4.11 && < 5 }
4242

4343
common bits-extra { build-depends: bits-extra >= 0.0.1.2 && < 0.1 }
44-
common bytestring { build-depends: bytestring >= 0.10 && < 0.12 }
44+
common bytestring { build-depends: bytestring >= 0.10 && < 0.13 }
4545
common cassava { build-depends: cassava >= 0.5.1.0 && < 0.6 }
46-
common containers { build-depends: containers >= 0.5 && < 0.7 }
46+
common containers { build-depends: containers >= 0.5 && < 0.8 }
4747
common criterion { build-depends: criterion >= 1.4.1.0 && < 1.7 }
48-
common deepseq { build-depends: deepseq >= 1.4 && < 1.5 }
48+
common deepseq { build-depends: deepseq >= 1.4 && < 1.6 }
4949
common directory { build-depends: directory >= 1.2.2 && < 1.4 }
50-
common doctest { build-depends: doctest >= 0.16.2 && < 0.21 }
50+
common doctest { build-depends: doctest >= 0.16.2 && < 0.23 }
5151
common doctest-discover { build-depends: doctest-discover >= 0.2 && < 0.3 }
52-
common hedgehog { build-depends: hedgehog >= 0.5 && < 1.3 }
52+
common hedgehog { build-depends: hedgehog >= 0.5 && < 1.5 }
5353
common hspec { build-depends: hspec >= 2.4 && < 3 }
5454
common hw-bits { build-depends: hw-bits >= 0.7.0.2 && < 0.8 }
5555
common hw-hedgehog { build-depends: hw-hedgehog >= 0.1.0.1 && < 0.2 }

0 commit comments

Comments
 (0)