Skip to content

Commit 89857ea

Browse files
sternenseemannsternenseemann
authored
Merge pull request #612 from NixOS/ci
.github: bump GHC 9.4 and 9.2 versions used in CI
2 parents e394e96 + e272dc0 commit 89857ea

File tree

5 files changed

+23
-21
lines changed

5 files changed

+23
-21
lines changed

‎.github/workflows/haskell-ci.yml

+19-17
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.16
11+
# version: 0.17.20231219
1212
#
13-
# REGENDATA ("0.16",["--branches","master","--github-patches",".github/workflows/ci-skip-package-map.patch","--doctest","--doctest-options=-i ../../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","--doctest-jobs=>= 8.8 && < 9.4","github","cabal.project"])
13+
# REGENDATA ("0.17.20231219",["--branches","master","--github-patches",".github/workflows/ci-skip-package-map.patch","--doctest","--doctest-options=-i ../../dist-newstyle/build/*/*/cabal2nix-*/build/autogen","--doctest-jobs=>= 8.8 && < 9.4","github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,14 +32,14 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.4.4
35+
- compiler: ghc-9.4.8
3636
compilerKind: ghc
37-
compilerVersion: 9.4.4
37+
compilerVersion: 9.4.8
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.2.7
40+
- compiler: ghc-9.2.8
4141
compilerKind: ghc
42-
compilerVersion: 9.2.7
42+
compilerVersion: 9.2.8
4343
setup-method: ghcup
4444
allow-failure: false
4545
- compiler: ghc-9.0.2
@@ -65,18 +65,18 @@ jobs:
6565
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
6666
if [ "${{ matrix.setup-method }}" = ghcup ]; then
6767
mkdir -p "$HOME/.ghcup/bin"
68-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
68+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
6969
chmod a+x "$HOME/.ghcup/bin/ghcup"
7070
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
71-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
71+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
7272
else
7373
apt-add-repository -y 'ppa:hvr/ghc'
7474
apt-get update
7575
apt-get install -y "$HCNAME"
7676
mkdir -p "$HOME/.ghcup/bin"
77-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
77+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
7878
chmod a+x "$HOME/.ghcup/bin/ghcup"
79-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
79+
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
8080
fi
8181
env:
8282
HCKIND: ${{ matrix.compilerKind }}
@@ -90,17 +90,19 @@ jobs:
9090
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
9191
HCDIR=/opt/$HCKIND/$HCVER
9292
if [ "${{ matrix.setup-method }}" = ghcup ]; then
93-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
93+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
94+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
95+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
9496
echo "HC=$HC" >> "$GITHUB_ENV"
95-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
96-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
97-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
97+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
98+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
99+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
98100
else
99101
HC=$HCDIR/bin/$HCKIND
100102
echo "HC=$HC" >> "$GITHUB_ENV"
101103
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
102104
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
103-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
105+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
104106
fi
105107
106108
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
@@ -152,7 +154,7 @@ jobs:
152154
- name: cache (tools)
153155
uses: actions/cache/restore@v3
154156
with:
155-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-dc7952fc
157+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-65c9c5ff
156158
path: ~/.haskell-ci-tools
157159
- name: install cabal-plan
158160
run: |
@@ -171,7 +173,7 @@ jobs:
171173
uses: actions/cache/save@v3
172174
if: always()
173175
with:
174-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-dc7952fc
176+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-65c9c5ff
175177
path: ~/.haskell-ci-tools
176178
- name: checkout
177179
uses: actions/checkout@v3

‎cabal2nix/cabal2nix.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ author: Peter Simons <[email protected]>
1212
-- list all contributors: git log --pretty='%an' | sort | uniq
1313
maintainer: sternenseemann <[email protected]>
1414
stability: stable
15-
tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.7 || == 9.4.4
15+
tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8
1616
category: Distribution, Nix
1717
homepage: https://github.com/nixos/cabal2nix#readme
1818
bug-reports: https://github.com/nixos/cabal2nix/issues

‎distribution-nixpkgs/distribution-nixpkgs.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license: BSD3
66
license-file: LICENSE
77
author: Peter Simons <[email protected]>
88
maintainer: sternenseemann <[email protected]>
9-
tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.7 || == 9.4.4
9+
tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8
1010
category: Distribution, Nix
1111
homepage: https://github.com/NixOS/cabal2nix/tree/master/distribution-nixpkgs#readme
1212
bug-reports: https://github.com/NixOS/cabal2nix/issues

‎hackage-db/hackage-db.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license: BSD3
99
license-file: LICENSE
1010
author: Peter Simons, Alexander Altman, Ben James, Kevin Quick
1111
maintainer: sternenseemann <[email protected]>
12-
tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.7 || == 9.4.4
12+
tested-with: GHC == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8
1313
category: Distribution
1414
homepage: https://github.com/NixOS/cabal2nix/tree/master/hackage-db#readme
1515
bug-reports: https://github.com/NixOS/cabal2nix/issues

‎language-nix/language-nix.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ license: BSD3
77
license-file: LICENSE
88
author: Peter Simons
99
maintainer: [email protected]
10-
tested-with: GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.7, GHC == 9.4.4
10+
tested-with: GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.2, GHC == 9.2.8, GHC == 9.4.8
1111
category: Distribution, Language, Nix
1212
homepage: https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme
1313
bug-reports: https://github.com/NixOS/cabal2nix/issues

0 commit comments

Comments
 (0)