Skip to content

Commit 1efe16b

Browse files
committed
CI: bump GHC 9.6 to 9.6.4 and actions/cache to v4
Also drop special runs on ci-* and release-* branches. Always go through PRs.
1 parent d26bd80 commit 1efe16b

File tree

5 files changed

+13
-20
lines changed

5 files changed

+13
-20
lines changed

.github/workflows/fix-whitespace.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
steps:
1111
- name: Checkout sources
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313

1414
- name: Check for whitespace violations
1515
uses: andreasabel/fix-whitespace-action@v1

.github/workflows/haskell-ci-simple.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@ on:
33
push:
44
branches:
55
- master
6-
- ci-*
7-
- release-*
86
pull_request:
97
branches:
108
- master
11-
- ci-*
12-
- release-*
139

1410
defaults:
1511
run:
@@ -34,7 +30,7 @@ jobs:
3430
# - "9.0.2"
3531
# - "9.2.8"
3632
- "9.4.8"
37-
- "9.6.3"
33+
- "9.6.4"
3834
- "9.8.1"
3935
include:
4036
- ghc: "9.8.1"
@@ -52,7 +48,7 @@ jobs:
5248
cabal-version: "latest"
5349
cabal-update: true
5450

55-
- uses: actions/cache@v3
51+
- uses: actions/cache@v4
5652
name: Cache cabal stuff
5753
with:
5854
path: |
@@ -84,7 +80,8 @@ jobs:
8480
- name: Test
8581
run: |
8682
cd alex-*/
87-
export ALEX=$(cabal list-bin alex)
83+
ALEX="$(cabal list-bin alex)"
84+
export ALEX
8885
cabal run --enable-tests alex:test:tests
8986
9087
- name: Haddock

.github/workflows/haskell-ci.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,18 @@
88
#
99
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.17.20231112
11+
# version: 0.17.20240127
1212
#
13-
# REGENDATA ("0.17.20231112",["github","alex.cabal"])
13+
# REGENDATA ("0.17.20240127",["github","alex.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
1717
push:
1818
branches:
1919
- master
20-
- ci-*
21-
- release-*
2220
pull_request:
2321
branches:
2422
- master
25-
- ci-*
26-
- release-*
2723
jobs:
2824
linux:
2925
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -41,9 +37,9 @@ jobs:
4137
compilerVersion: 9.8.1
4238
setup-method: ghcup
4339
allow-failure: false
44-
- compiler: ghc-9.6.3
40+
- compiler: ghc-9.6.4
4541
compilerKind: ghc
46-
compilerVersion: 9.6.3
42+
compilerVersion: 9.6.4
4743
setup-method: ghcup
4844
allow-failure: false
4945
- compiler: ghc-9.4.8
@@ -225,7 +221,7 @@ jobs:
225221
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
226222
cabal-plan
227223
- name: restore cache
228-
uses: actions/cache/restore@v3
224+
uses: actions/cache/restore@v4
229225
with:
230226
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
231227
path: ~/.cabal/store
@@ -261,7 +257,7 @@ jobs:
261257
rm -f cabal.project.local
262258
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
263259
- name: save cache
264-
uses: actions/cache/save@v3
260+
uses: actions/cache/save@v4
265261
if: always()
266262
with:
267263
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

alex.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ build-type: Simple
2323

2424
tested-with:
2525
GHC == 9.8.1
26-
GHC == 9.6.3
26+
GHC == 9.6.4
2727
GHC == 9.4.8
2828
GHC == 9.2.8
2929
GHC == 9.0.2

cabal.haskell-ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
branches: master ci-* release-*
1+
branches: master
22

33
-- -- For bootstrapping:
44
-- apt: alex happy

0 commit comments

Comments
 (0)