Skip to content

Commit 611c45f

Browse files
erikderikd
committed
CI: Regenerate spec
1 parent 83a70b6 commit 611c45f

File tree

2 files changed

+15
-45
lines changed

2 files changed

+15
-45
lines changed

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

Lines changed: 14 additions & 44 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.20241202
11+
# version: 0.19.20250605
1212
#
13-
# REGENDATA ("0.19.20241202",["github","system-linux-proc.cabal"])
13+
# REGENDATA ("0.19.20250605",["github","system-linux-proc.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
linux:
2121
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-24.04
2323
timeout-minutes:
2424
60
2525
container:
@@ -28,24 +28,24 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.12.0.20241128
31+
- compiler: ghc-9.12.2
3232
compilerKind: ghc
33-
compilerVersion: 9.12.0.20241128
34-
setup-method: ghcup-prerelease
33+
compilerVersion: 9.12.2
34+
setup-method: ghcup
3535
allow-failure: false
36-
- compiler: ghc-9.10.1
36+
- compiler: ghc-9.10.2
3737
compilerKind: ghc
38-
compilerVersion: 9.10.1
38+
compilerVersion: 9.10.2
3939
setup-method: ghcup
4040
allow-failure: false
4141
- compiler: ghc-9.8.4
4242
compilerKind: ghc
4343
compilerVersion: 9.8.4
4444
setup-method: ghcup
4545
allow-failure: false
46-
- compiler: ghc-9.6.6
46+
- compiler: ghc-9.6.7
4747
compilerKind: ghc
48-
compilerVersion: 9.6.6
48+
compilerVersion: 9.6.7
4949
setup-method: ghcup
5050
allow-failure: false
5151
- compiler: ghc-8.10.7
@@ -62,12 +62,12 @@ jobs:
6262
- name: Install GHCup
6363
run: |
6464
mkdir -p "$HOME/.ghcup/bin"
65-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
65+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
6666
chmod a+x "$HOME/.ghcup/bin/ghcup"
6767
- name: Install cabal-install
6868
run: |
69-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
70-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
69+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
70+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
7171
- name: Install GHC (GHCup)
7272
if: matrix.setup-method == 'ghcup'
7373
run: |
@@ -82,21 +82,6 @@ jobs:
8282
HCKIND: ${{ matrix.compilerKind }}
8383
HCNAME: ${{ matrix.compiler }}
8484
HCVER: ${{ matrix.compilerVersion }}
85-
- name: Install GHC (GHCup prerelease)
86-
if: matrix.setup-method == 'ghcup-prerelease'
87-
run: |
88-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
89-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
90-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
91-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
92-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
93-
echo "HC=$HC" >> "$GITHUB_ENV"
94-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
95-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
96-
env:
97-
HCKIND: ${{ matrix.compilerKind }}
98-
HCNAME: ${{ matrix.compiler }}
99-
HCVER: ${{ matrix.compilerVersion }}
10085
- name: Set PATH and environment variables
10186
run: |
10287
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -107,7 +92,7 @@ jobs:
10792
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
10893
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
10994
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
110-
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
95+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
11196
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
11297
env:
11398
HCKIND: ${{ matrix.compilerKind }}
@@ -135,18 +120,6 @@ jobs:
135120
repository hackage.haskell.org
136121
url: http://hackage.haskell.org/
137122
EOF
138-
if $HEADHACKAGE; then
139-
cat >> $CABAL_CONFIG <<EOF
140-
repository head.hackage.ghc.haskell.org
141-
url: https://ghc.gitlab.haskell.org/head.hackage/
142-
secure: True
143-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
144-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
145-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
146-
key-threshold: 3
147-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
148-
EOF
149-
fi
150123
cat >> $CABAL_CONFIG <<EOF
151124
program-default-options
152125
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -198,9 +171,6 @@ jobs:
198171
echo " ghc-options: -Werror=missing-methods" >> cabal.project
199172
cat >> cabal.project <<EOF
200173
EOF
201-
if $HEADHACKAGE; then
202-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
203-
fi
204174
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(system-linux-proc)$/; }' >> cabal.project.local
205175
cat cabal.project
206176
cat cabal.project.local

‎system-linux-proc.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ extra-source-files: ChangeLog.md
1717
stability: provisional
1818
cabal-version: >= 1.10
1919

20-
tested-with: GHC == 8.10.7, GHC == 9.6.6, GHC == 9.8.4, GHC == 9.10.1, GHC == 9.12.1
20+
tested-with: GHC == 8.10.7, GHC == 9.6.7, GHC == 9.8.4, GHC == 9.10.2, GHC == 9.12.2
2121

2222
library
2323
default-language: Haskell2010

0 commit comments

Comments
 (0)