Skip to content

Commit 80207dd

Browse files
authored
Merge pull request #8 from commercialhaskell/ci
Update CI
2 parents 44cb98e + 723ccf4 commit 80207dd

12 files changed

Lines changed: 48 additions & 47 deletions

.github/workflows/unit-tests.yml

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ on:
77
- master
88
workflow_dispatch:
99

10-
# As of 6 August 2023, ubuntu-latest, windows-latest and macos-latest come
11-
# with Stack 2.11.1 and GHC 9.6.2.
10+
# As of 2026-06-30:
11+
# * ubuntu-latest comes with Stack 3.11.1 and GHC 9.14.1
12+
# * windows-latest comes with Stack 3.11.1 and GHC 9.14.1
13+
# * macos-latest does not come with Haskell tools
1214

1315
jobs:
1416
unit-tests:
@@ -19,34 +21,42 @@ jobs:
1921
matrix:
2022
os:
2123
- ubuntu-latest
22-
resolver:
23-
- stack-ghc-9.2.8.yaml
24-
- stack-ghc-9.4.5.yaml
25-
- stack-ghc-9.6.2.yaml
24+
snapshot:
25+
- stack-ghc-9.8.4.yaml
26+
- stack-ghc-9.10.3.yaml
27+
- stack-ghc-9.12.4.yaml
28+
- stack-ghc-9.14.1.yaml
2629
include:
2730
- os: windows-latest
28-
resolver: stack-ghc-9.6.2.yaml
31+
snapshot: stack-ghc-9.10.3.yaml
2932
- os: macos-latest
30-
resolver: stack-ghc-9.6.2.yaml
33+
snapshot: stack-ghc-9.10.3.yaml
3134
steps:
3235
- name: Clone project
33-
uses: actions/checkout@v3
36+
uses: actions/checkout@v7
3437
- name: Cache dependencies on Unix-like OS
3538
if: startsWith(runner.os, 'Linux') || startsWith(runner.os, 'macOS')
36-
uses: actions/cache@v3
39+
uses: actions/cache@v6
3740
with:
3841
path: ~/.stack
39-
key: ${{ runner.os }}-${{ matrix.resolver }}
42+
key: ${{ runner.os }}-${{ matrix.snapshot }}
4043
- name: Cache dependencies on Windows
4144
if: startsWith(runner.os, 'Windows')
42-
uses: actions/cache@v3
45+
uses: actions/cache@v6
4346
with:
4447
path: |
4548
~\AppData\Roaming\stack
4649
~\AppData\Local\Programs\stack
47-
key: ${{ runner.os }}-${{ matrix.resolver }}
50+
key: ${{ runner.os }}-${{ matrix.snapshot }}
4851
- name: Run tests
4952
shell: bash
5053
run: |
5154
set -ex
52-
stack --resolver ${{ matrix.resolver }} test --bench --no-run-benchmarks --haddock --no-haddock-deps
55+
if [[ "${{ matrix.os }}" == "macos-latest" ]]
56+
then
57+
# As at 2026-06-30:
58+
#
59+
# * macos-latest does not include Haskell tools.
60+
curl -sSL https://get.haskellstack.org/ | sh
61+
fi
62+
stack --snapshot ${{ matrix.snapshot }} test --bench --no-run-benchmarks --haddock --no-haddock-deps

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
*~
33

44
# Haskell Tool Stack-related
5-
/.stack-work/
5+
.stack-work/
6+
*.yaml.lock

stack-ghc-9.10.3.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Snapshot specification for GHC 9.10.3.
2+
snapshot: lts-24.46 # GHC 9.10.3

stack-ghc-9.12.4.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Snapshot specification for GHC 9.12.4.
2+
snapshot: nightly-2026-06-29 # GHC 9.12.4

stack-ghc-9.14.1.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Snapshot specification for GHC 9.14.1.
2+
snapshot: nightly-2026-06-29 # GHC 9.12.4
3+
compiler: ghc-9.14.1
4+
compiler-check: match-exact
5+
6+
allow-newer: true
7+
8+
allow-newer-deps:
9+
- cborg
10+
- serialise

stack-ghc-9.2.8.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Snapshot specification for GHC 9.2.8.
2-
resolver: lts-20.26 # GHC 9.2.8
2+
snapshot: lts-20.26 # GHC 9.2.8
33

44
packages:
55
- crypton-0.33
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# Snapshot specification for GHC 9.4.5.
2-
resolver: lts-21.6 # GHC 9.4.5
1+
# Snapshot specification for GHC 9.4.8.
2+
snapshot: lts-21.25 # GHC 9.4.8
33

44
packages:
55
- crypton-0.33

stack-ghc-9.6.2.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

stack-ghc-9.6.7.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Snapshot specification for GHC 9.6.7.
2+
snapshot: lts-22.44 # GHC 9.6.7

stack-ghc-9.8.4.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Snapshot specification for GHC 9.8.4.
2+
snapshot: lts-23.28 # GHC 9.8.4

0 commit comments

Comments
 (0)