Skip to content

Commit 3a5da84

Browse files
no matrix
1 parent b551a00 commit 3a5da84

File tree

2 files changed

+12
-21
lines changed

2 files changed

+12
-21
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,14 @@ jobs:
4848

4949
test-with-stack:
5050
name: Stack
51-
runs-on: ${{ matrix.os }}
52-
strategy:
53-
fail-fast: false
54-
matrix:
55-
os: [ubuntu-latest]
56-
resolver: [lts-24, nightly]
51+
runs-on: ubuntu-latest
5752
env:
58-
STACK_ARGS: '--resolver ${{ matrix.resolver }} --system-ghc'
53+
STACK_ARGS: '--resolver lts-24 --system-ghc'
5954
steps:
6055
- uses: actions/checkout@v4
6156

6257
- uses: haskell-actions/setup@v2
63-
id: setup-haskell-cabal
58+
id: setup-haskell-stack
6459
name: Setup Haskell
6560
with:
6661
enable-stack: true
@@ -71,11 +66,11 @@ jobs:
7166
uses: actions/cache@v4
7267
with:
7368
path: |
74-
${{ steps.setup-haskell-cabal.outputs.stack-root }}
69+
${{ steps.setup-haskell-stack.outputs.stack-root }}
7570
.stack-work
76-
key: ${{ runner.os }}-${{ matrix.resolver }}-${{ github.sha }}
71+
key: ${{ runner.os }}-lts-24-${{ github.sha }}
7772
restore-keys: |
78-
${{ runner.os }}-${{ matrix.resolver }}
73+
${{ runner.os }}-lts-24
7974
8075
- name: Build
8176
run: |
@@ -87,11 +82,8 @@ jobs:
8782
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
8883
run: |
8984
set -ex
90-
if [ "${{ matrix.os }}.${{ matrix.resolver }}" == "ubuntu-latest.lts-24" ] && [ -n "${COVERALLS_REPO_TOKEN}" ]; then
91-
stack $STACK_ARGS test --coverage
92-
stack $STACK_ARGS hpc report --all
93-
curl -L https://github.com/rubik/stack-hpc-coveralls/releases/download/v0.0.7.0/shc-Linux-X64.tar.bz2 | tar xj shc
94-
./shc --repo-token="$COVERALLS_REPO_TOKEN" --partial-coverage --fetch-coverage combined all
95-
else
96-
stack $STACK_ARGS test
97-
fi
85+
[ -n "${COVERALLS_REPO_TOKEN}" ]
86+
stack $STACK_ARGS test --coverage
87+
stack $STACK_ARGS hpc report --all
88+
curl -L https://github.com/rubik/stack-hpc-coveralls/releases/download/v0.0.7.0/shc-Linux-X64.tar.bz2 | tar xj shc
89+
./shc --repo-token="$COVERALLS_REPO_TOKEN" --partial-coverage --fetch-coverage combined all

stack.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
#
1818
# snapshot: ./custom-snapshot.yaml
1919
# snapshot: https://example.com/snapshots/2024-01-01.yaml
20-
snapshot:
21-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/14.yaml
20+
snapshot: lts-24
2221

2322
# User packages to be built.
2423
# Various formats can be used as shown in the example below.

0 commit comments

Comments
 (0)