Skip to content

Commit 1c42e36

Browse files
committed
Use @v4 actions to avoid warnings. Some tweaks to the build matrix.
1 parent bd912c5 commit 1c42e36

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This GitHub workflow config has been generated by a script via
22
#
3-
# haskell-ci 'github' 'StateVar.cabal' '--output=.github/workflows/haskell-ci.yml'
3+
# haskell-ci 'github' 'StateVar.cabal' '--distribution=focal' '--output=.github/workflows/haskell-ci.yml'
44
#
55
# To regenerate the script (for example after adjusting tested-with) run
66
#
@@ -10,7 +10,7 @@
1010
#
1111
# version: 0.17.20240109
1212
#
13-
# REGENDATA ("0.17.20240109",["github","StateVar.cabal","--output=.github/workflows/haskell-ci.yml"])
13+
# REGENDATA ("0.17.20240109",["github","StateVar.cabal","--distribution=focal","--output=.github/workflows/haskell-ci.yml"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ jobs:
2323
timeout-minutes:
2424
60
2525
container:
26-
image: buildpack-deps:bionic
26+
image: buildpack-deps:focal
2727
continue-on-error: ${{ matrix.allow-failure }}
2828
strategy:
2929
matrix:
@@ -88,16 +88,6 @@ jobs:
8888
compilerVersion: 7.10.3
8989
setup-method: hvr-ppa
9090
allow-failure: false
91-
- compiler: ghc-7.8.4
92-
compilerKind: ghc
93-
compilerVersion: 7.8.4
94-
setup-method: hvr-ppa
95-
allow-failure: false
96-
- compiler: ghc-7.6.3
97-
compilerKind: ghc
98-
compilerVersion: 7.6.3
99-
setup-method: hvr-ppa
100-
allow-failure: false
10191
- compiler: ghc-7.4.2
10292
compilerKind: ghc
10393
compilerVersion: 7.4.2
@@ -217,7 +207,7 @@ jobs:
217207
chmod a+x $HOME/.cabal/bin/cabal-plan
218208
cabal-plan --version
219209
- name: checkout
220-
uses: actions/checkout@v3
210+
uses: actions/checkout@v4
221211
with:
222212
path: source
223213
- name: initial cabal.project for sdist
@@ -253,7 +243,7 @@ jobs:
253243
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
254244
cabal-plan
255245
- name: restore cache
256-
uses: actions/cache/restore@v3
246+
uses: actions/cache/restore@v4
257247
with:
258248
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
259249
path: ~/.cabal/store
@@ -280,7 +270,7 @@ jobs:
280270
rm -f cabal.project.local
281271
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
282272
- name: save cache
283-
uses: actions/cache/save@v3
273+
uses: actions/cache/save@v4
284274
if: always()
285275
with:
286276
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

StateVar.cabal

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,15 @@ description:
1717
build-type: Simple
1818
tested-with:
1919
GHC == 7.0.4
20-
GHC == 7.10.3
2120
GHC == 7.2.2
2221
GHC == 7.4.2
23-
GHC == 7.6.3
24-
GHC == 7.8.4
22+
GHC == 7.10.3
2523
GHC == 8.0.2
26-
GHC == 8.10.7
2724
GHC == 8.2.2
2825
GHC == 8.4.4
2926
GHC == 8.6.5
3027
GHC == 8.8.4
28+
GHC == 8.10.7
3129
GHC == 9.0.2
3230
GHC == 9.2.8
3331
GHC == 9.4.8

0 commit comments

Comments
 (0)