Skip to content

Commit 892bd38

Browse files
phadejphadej
authored
Merge pull request #66 from haskellari/ghc-9.12
Support GHC-9.12
2 parents d7921ff + 6834277 commit 892bd38

2 files changed

Lines changed: 38 additions & 25 deletions

File tree

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

Lines changed: 33 additions & 22 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.20240513
11+
# version: 0.19.20241222
1212
#
13-
# REGENDATA ("0.19.20240513",["github","cabal.project"])
13+
# REGENDATA ("0.19.20241222",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,19 +32,24 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35+
- compiler: ghc-9.12.1
36+
compilerKind: ghc
37+
compilerVersion: 9.12.1
38+
setup-method: ghcup
39+
allow-failure: false
3540
- compiler: ghc-9.10.1
3641
compilerKind: ghc
3742
compilerVersion: 9.10.1
3843
setup-method: ghcup
3944
allow-failure: false
40-
- compiler: ghc-9.8.2
45+
- compiler: ghc-9.8.4
4146
compilerKind: ghc
42-
compilerVersion: 9.8.2
47+
compilerVersion: 9.8.4
4348
setup-method: ghcup
4449
allow-failure: false
45-
- compiler: ghc-9.6.5
50+
- compiler: ghc-9.6.6
4651
compilerKind: ghc
47-
compilerVersion: 9.6.5
52+
compilerVersion: 9.6.6
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.4.8
@@ -79,15 +84,30 @@ jobs:
7984
allow-failure: false
8085
fail-fast: false
8186
steps:
82-
- name: apt
87+
- name: apt-get install
8388
run: |
8489
apt-get update
8590
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
91+
- name: Install GHCup
92+
run: |
8693
mkdir -p "$HOME/.ghcup/bin"
87-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
94+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
8895
chmod a+x "$HOME/.ghcup/bin/ghcup"
96+
- name: Install cabal-install (prerelease)
97+
run: |
98+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
99+
"$HOME/.ghcup/bin/ghcup" install cabal 3.15.0.0.2024.10.3 || (cat "$HOME"/.ghcup/logs/*.* && false)
100+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.15.0.0.2024.10.3 -vnormal+nowrap" >> "$GITHUB_ENV"
101+
- name: Install GHC (GHCup)
102+
if: matrix.setup-method == 'ghcup'
103+
run: |
89104
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
90-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
105+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
106+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
107+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
108+
echo "HC=$HC" >> "$GITHUB_ENV"
109+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
110+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
91111
env:
92112
HCKIND: ${{ matrix.compilerKind }}
93113
HCNAME: ${{ matrix.compiler }}
@@ -98,21 +118,12 @@ jobs:
98118
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
99119
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
100120
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
101-
HCDIR=/opt/$HCKIND/$HCVER
102-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
103-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
104-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
105-
echo "HC=$HC" >> "$GITHUB_ENV"
106-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
107-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
108-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
109121
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
110122
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
111123
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
112124
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
113125
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
114126
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
115-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
116127
env:
117128
HCKIND: ${{ matrix.compilerKind }}
118129
HCNAME: ${{ matrix.compiler }}
@@ -164,8 +175,8 @@ jobs:
164175
- name: install cabal-docspec
165176
run: |
166177
mkdir -p $HOME/.cabal/bin
167-
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240414/cabal-docspec-0.0.0.20240414-x86_64-linux.xz > cabal-docspec.xz
168-
echo '2d18a3f79619e8ec5f11870f926f6dc2616e02a6c889315b7f82044b95a1adb9 cabal-docspec.xz' | sha256sum -c -
178+
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240703/cabal-docspec-0.0.0.20240703-x86_64-linux.xz > cabal-docspec.xz
179+
echo '48bf3b7fd2f7f0caa6162afee57a755be8523e7f467b694900eb420f5f9a7b76 cabal-docspec.xz' | sha256sum -c -
169180
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
170181
rm -f cabal-docspec.xz
171182
chmod a+x $HOME/.cabal/bin/cabal-docspec
@@ -199,7 +210,7 @@ jobs:
199210
echo " ghc-options: -Werror=missing-methods" >> cabal.project
200211
cat >> cabal.project <<EOF
201212
EOF
202-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(some)$/; }' >> cabal.project.local
213+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(some)$/; }' >> cabal.project.local
203214
cat cabal.project
204215
cat cabal.project.local
205216
- name: dump install plan
@@ -256,8 +267,8 @@ jobs:
256267
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='some -newtype-unsafe' --dependencies-only -j2 all
257268
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='some -newtype-unsafe' all
258269
- name: save cache
259-
uses: actions/cache/save@v4
260270
if: always()
271+
uses: actions/cache/save@v4
261272
with:
262273
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
263274
path: ~/.cabal/store

‎some.cabal‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: some
22
version: 1.0.6
3+
x-revision: 2
34
cabal-version: >=1.10
45
build-type: Simple
56
author:
@@ -30,9 +31,10 @@ tested-with:
3031
|| ==9.0.2
3132
|| ==9.2.8
3233
|| ==9.4.8
33-
|| ==9.6.5
34-
|| ==9.8.2
34+
|| ==9.6.6
35+
|| ==9.8.4
3536
|| ==9.10.1
37+
|| ==9.12.1
3638

3739
extra-source-files: ChangeLog.md
3840

@@ -69,7 +71,7 @@ library
6971

7072
other-modules: Data.GADT.Internal
7173
build-depends:
72-
base >=4.12 && <4.21
74+
base >=4.12 && <4.22
7375
, deepseq >=1.4.4.0 && <1.6
7476

7577
if !impl(ghc >= 9.8)

0 commit comments

Comments
 (0)