Skip to content

Commit 0c5b9eb

Browse files
committed
Update CI
1 parent 3fe64dc commit 0c5b9eb

2 files changed

Lines changed: 12 additions & 7 deletions

File tree

.github/workflows/haskell-ci.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20250722
11+
# version: 0.19.20260209
1212
#
13-
# REGENDATA ("0.19.20250722",["github","cabal.project"])
13+
# REGENDATA ("0.19.20260209",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -20,6 +20,11 @@ on:
2020
pull_request:
2121
branches:
2222
- master
23+
merge_group:
24+
branches:
25+
- master
26+
workflow_dispatch:
27+
{}
2328
jobs:
2429
linux:
2530
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -101,8 +106,8 @@ jobs:
101106
chmod a+x "$HOME/.ghcup/bin/ghcup"
102107
- name: Install cabal-install
103108
run: |
104-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
105-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
109+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
110+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
106111
- name: Install GHC (GHCup)
107112
if: matrix.setup-method == 'ghcup'
108113
run: |
@@ -178,7 +183,7 @@ jobs:
178183
chmod a+x $HOME/.cabal/bin/cabal-plan
179184
cabal-plan --version
180185
- name: checkout
181-
uses: actions/checkout@v4
186+
uses: actions/checkout@v5
182187
with:
183188
path: source
184189
- name: initial cabal.project for sdist

.github/workflows/simple.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ jobs:
3232
cabal-version: '3.12.1.0'
3333

3434
- name: Set up PostgreSQL
35-
uses: ikalnytskyi/action-setup-postgres@v6
35+
uses: ikalnytskyi/action-setup-postgres@v8
3636
id: postgres
3737
with:
3838
username: ci
3939
password: sw0rdfish
4040
database: test
4141

4242
- name: Checkout
43-
uses: actions/checkout@v4
43+
uses: actions/checkout@v5
4444

4545
- name: Cache
4646
uses: actions/cache@v4

0 commit comments

Comments
 (0)