Skip to content

Commit 6aecab7

Browse files
authored
Merge pull request #130 from haskell-servant/ghc-9.6.7
GHC 9.2.8, 9.6.7
2 parents 8a622ef + c967211 commit 6aecab7

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

.github/workflows/haskell-ci.yml

+10-10
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.20250115
11+
# version: 0.19.20250315
1212
#
13-
# REGENDATA ("0.19.20250115",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.19.20250315",["github","--config=cabal.haskell-ci","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -42,19 +42,19 @@ jobs:
4242
compilerVersion: 9.8.4
4343
setup-method: ghcup
4444
allow-failure: false
45-
- compiler: ghc-9.6.6
45+
- compiler: ghc-9.6.7
4646
compilerKind: ghc
47-
compilerVersion: 9.6.6
47+
compilerVersion: 9.6.7
4848
setup-method: ghcup
4949
allow-failure: false
5050
- compiler: ghc-9.4.8
5151
compilerKind: ghc
5252
compilerVersion: 9.4.8
5353
setup-method: ghcup
5454
allow-failure: false
55-
- compiler: ghc-9.2.7
55+
- compiler: ghc-9.2.8
5656
compilerKind: ghc
57-
compilerVersion: 9.2.7
57+
compilerVersion: 9.2.8
5858
setup-method: ghcup
5959
allow-failure: false
6060
- compiler: ghc-9.0.2
@@ -81,12 +81,12 @@ jobs:
8181
- name: Install GHCup
8282
run: |
8383
mkdir -p "$HOME/.ghcup/bin"
84-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
84+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.0/x86_64-linux-ghcup-0.1.50.0 > "$HOME/.ghcup/bin/ghcup"
8585
chmod a+x "$HOME/.ghcup/bin/ghcup"
8686
- name: Install cabal-install
8787
run: |
88-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
89-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
88+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
89+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1 -vnormal+nowrap" >> "$GITHUB_ENV"
9090
- name: Install GHC (GHCup)
9191
if: matrix.setup-method == 'ghcup'
9292
run: |

servant-swagger-ui-core/servant-swagger-ui-core.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ tested-with:
2222
GHC ==8.8.4
2323
|| ==8.10.7
2424
|| ==9.0.2
25-
|| ==9.2.7
25+
|| ==9.2.8
2626
|| ==9.4.8
27-
|| ==9.6.6
27+
|| ==9.6.7
2828
|| ==9.8.4
2929
|| ==9.10.1
3030

servant-swagger-ui-example/servant-swagger-ui-example.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ tested-with:
1717
GHC ==8.8.4
1818
|| ==8.10.7
1919
|| ==9.0.2
20-
|| ==9.2.7
20+
|| ==9.2.8
2121
|| ==9.4.8
22-
|| ==9.6.6
22+
|| ==9.6.7
2323
|| ==9.8.4
2424
|| ==9.10.1
2525

servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ tested-with:
2121
GHC ==8.8.4
2222
|| ==8.10.7
2323
|| ==9.0.2
24-
|| ==9.2.7
24+
|| ==9.2.8
2525
|| ==9.4.8
26-
|| ==9.6.6
26+
|| ==9.6.7
2727
|| ==9.8.4
2828
|| ==9.10.1
2929

servant-swagger-ui-redoc/servant-swagger-ui-redoc.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ tested-with:
2121
GHC ==8.8.4
2222
|| ==8.10.7
2323
|| ==9.0.2
24-
|| ==9.2.7
24+
|| ==9.2.8
2525
|| ==9.4.8
26-
|| ==9.6.6
26+
|| ==9.6.7
2727
|| ==9.8.4
2828
|| ==9.10.1
2929

servant-swagger-ui/servant-swagger-ui.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ tested-with:
2121
GHC ==8.8.4
2222
|| ==8.10.7
2323
|| ==9.0.2
24-
|| ==9.2.7
24+
|| ==9.2.8
2525
|| ==9.4.8
26-
|| ==9.6.6
26+
|| ==9.6.7
2727
|| ==9.8.4
2828
|| ==9.10.1
2929

0 commit comments

Comments
 (0)