Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilgrem committed Oct 16, 2023
1 parent f93a5ad commit ac0e447
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 586 deletions.
57 changes: 28 additions & 29 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

name: CI

# Trigger the workflow on push or pull request, but only for the master branch
Expand All @@ -14,18 +13,22 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
cabal: ["3.4"]
cabal: ["3.10"]
ghc:
- "8.8.4"
- "8.10.4"
- "9.0.1"
# GHC versions listed as current stable releases
- "9.2.8"
- "9.4.7"
- "9.6.3"
# GHC 9.8 only works with cabal-install >= 3.10.2.0, which is not
# available from haskell-actions/setup (or on Hackage)
# - "9.8.1"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: haskell/actions/setup@v1.2
- uses: haskell-actions/setup@v2
id: setup-haskell-cabal
name: Setup Haskell
name: Setup GHC and cabal-install
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}
Expand All @@ -38,7 +41,7 @@ jobs:
run: |
cabal freeze
- uses: actions/cache@v2.1.3
- uses: actions/cache@v3
name: Cache ~/.cabal/store
with:
path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
Expand All @@ -52,33 +55,29 @@ jobs:
run: |
cabal build all
- name: Test
- name: Test the test-suite test
run: |
cabal test path:test
# - name: Test
# run: |
# cabal test path:validity-test
# - name: Test the test-suite validity-test
# run: |
# cabal test path:validity-test

# As of 2023-10-16, the GitHub-hosted runner on ubuntu-latest comes with
# Stack 2.13.1 and GHC 9.6.3.
stack:
name: stack / ghc ${{ matrix.ghc }}
runs-on: ubuntu-latest
strategy:
matrix:
stack: ["2.3.1"]
ghc: ["8.8.4"]
ghc: ["9.6.3"]

steps:
- uses: actions/checkout@v2

- uses: haskell/actions/[email protected]
name: Setup Haskell Stack
with:
ghc-version: ${{ matrix.ghc }}
stack-version: ${{ matrix.stack }}
- name: Clone project
uses: actions/checkout@v4

- uses: actions/[email protected]
name: Cache ~/.stack
- name: Cache Stack root
uses: actions/cache@v3
with:
path: ~/.stack
key: ${{ runner.os }}-${{ matrix.ghc }}-stack
Expand All @@ -91,10 +90,10 @@ jobs:
run: |
stack build --system-ghc --test --bench --no-run-tests --no-run-benchmarks
- name: Test
- name: Test the test-suite test
run: |
stack test --system-ghc :test
stack test path:test:test --system-ghc
# - name: Test
# run: |
# stack test --system-ghc :validity-test
# - name: Test the test-suite validity-test
# run: |
# stack test path:test:validity-test --system-ghc
46 changes: 1 addition & 45 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,45 +1 @@
resolver: nightly-2021-11-19
extra-deps:
- github: NorfairKing/validity
commit: 35bc8d45b27e6c21429e4b681b16e46ccd541b3b
subdirs:
- genvalidity
- genvalidity-aeson
- genvalidity-bytestring
- genvalidity-containers
- genvalidity-criterion
- genvalidity-hspec
- genvalidity-hspec-aeson
- genvalidity-hspec-binary
- genvalidity-hspec-cereal
- genvalidity-hspec-hashable
- genvalidity-hspec-optics
- genvalidity-hspec-persistent
- genvalidity-path
- genvalidity-persistent
- genvalidity-property
- genvalidity-scientific
- genvalidity-sydtest
- genvalidity-sydtest-aeson
- genvalidity-sydtest-hashable
- genvalidity-sydtest-lens
- genvalidity-sydtest-persistent
- genvalidity-text
- genvalidity-time
- genvalidity-unordered-containers
- genvalidity-uuid
- genvalidity-vector
- validity
- validity-aeson
- validity-bytestring
- validity-containers
- validity-path
- validity-persistent
- validity-primitive
- validity-scientific
- validity-text
- validity-time
- validity-unordered-containers
- validity-uuid
- validity-vector

resolver: nightly-2023-10-16 # GHC 9.6.3
Loading

0 comments on commit ac0e447

Please sign in to comment.