Skip to content

Commit 711ffe9

Browse files
BodigrimBodigrim
committed
Regenerate CI
1 parent 736eaee commit 711ffe9

File tree

2 files changed

+28
-63
lines changed

2 files changed

+28
-63
lines changed

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

Lines changed: 27 additions & 62 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.20241111
11+
# version: 0.19.20250801
1212
#
13-
# REGENDATA ("0.19.20241111",["github","language-c.cabal"])
13+
# REGENDATA ("0.19.20250801",["github","language-c.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.20241031
31+
- compiler: ghc-9.12.2
3232
compilerKind: ghc
33-
compilerVersion: 9.12.0.20241031
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
41-
- compiler: ghc-9.8.2
41+
- compiler: ghc-9.8.4
4242
compilerKind: ghc
43-
compilerVersion: 9.8.2
43+
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-9.4.8
@@ -78,6 +78,11 @@ jobs:
7878
compilerVersion: 8.6.5
7979
setup-method: ghcup
8080
allow-failure: false
81+
- compiler: ghc-8.4.4
82+
compilerKind: ghc
83+
compilerVersion: 8.4.4
84+
setup-method: ghcup
85+
allow-failure: false
8186
- compiler: ghc-8.2.2
8287
compilerKind: ghc
8388
compilerVersion: 8.2.2
@@ -93,30 +98,16 @@ jobs:
9398
- name: apt-get install
9499
run: |
95100
apt-get update
96-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
101+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
97102
- name: Install GHCup
98103
run: |
99104
mkdir -p "$HOME/.ghcup/bin"
100-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
105+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
101106
chmod a+x "$HOME/.ghcup/bin/ghcup"
102107
- name: Install cabal-install
103108
run: |
104-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
105-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
106-
- name: Install GHC (hvr-ppa)
107-
if: matrix.setup-method == 'hvr-ppa'
108-
run: |
109-
apt-add-repository -y 'ppa:hvr/ghc'
110-
apt-get update
111-
apt-get install -y "$HCNAME"
112-
HC=$HCDIR/bin/$HCKIND
113-
echo "HC=$HC" >> "$GITHUB_ENV"
114-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
115-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
116-
env:
117-
HCKIND: ${{ matrix.compilerKind }}
118-
HCNAME: ${{ matrix.compiler }}
119-
HCVER: ${{ matrix.compilerVersion }}
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"
120111
- name: Install GHC (GHCup)
121112
if: matrix.setup-method == 'ghcup'
122113
run: |
@@ -131,21 +122,6 @@ jobs:
131122
HCKIND: ${{ matrix.compilerKind }}
132123
HCNAME: ${{ matrix.compiler }}
133124
HCVER: ${{ matrix.compilerVersion }}
134-
- name: Install GHC (GHCup prerelease)
135-
if: matrix.setup-method == 'ghcup-prerelease'
136-
run: |
137-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
138-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
139-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
140-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
141-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
142-
echo "HC=$HC" >> "$GITHUB_ENV"
143-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
144-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
145-
env:
146-
HCKIND: ${{ matrix.compilerKind }}
147-
HCNAME: ${{ matrix.compiler }}
148-
HCVER: ${{ matrix.compilerVersion }}
149125
- name: Set PATH and environment variables
150126
run: |
151127
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -156,7 +132,7 @@ jobs:
156132
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
157133
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
158134
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
159-
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
135+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
160136
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
161137
env:
162138
HCKIND: ${{ matrix.compilerKind }}
@@ -184,18 +160,6 @@ jobs:
184160
repository hackage.haskell.org
185161
url: http://hackage.haskell.org/
186162
EOF
187-
if $HEADHACKAGE; then
188-
cat >> $CABAL_CONFIG <<EOF
189-
repository head.hackage.ghc.haskell.org
190-
url: https://ghc.gitlab.haskell.org/head.hackage/
191-
secure: True
192-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
193-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
194-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
195-
key-threshold: 3
196-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
197-
EOF
198-
fi
199163
cat >> $CABAL_CONFIG <<EOF
200164
program-default-options
201165
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -244,12 +208,13 @@ jobs:
244208
touch cabal.project.local
245209
echo "packages: ${PKGDIR_language_c}" >> cabal.project
246210
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package language-c" >> cabal.project ; fi
247-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
211+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
212+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package language-c" >> cabal.project ; fi
213+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
214+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package language-c" >> cabal.project ; fi
215+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
248216
cat >> cabal.project <<EOF
249217
EOF
250-
if $HEADHACKAGE; then
251-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
252-
fi
253218
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(language-c)$/; }' >> cabal.project.local
254219
cat cabal.project
255220
cat cabal.project.local

‎language-c.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ copyright: LICENSE
77
maintainer: [email protected]
88
author: AUTHORS
99
tested-with:
10-
ghc ==9.12.1 ghc ==9.10.1 ghc ==9.8.2 ghc ==9.6.6 ghc ==9.4.8
10+
ghc ==9.12.2 ghc ==9.10.2 ghc ==9.8.4 ghc ==9.6.7 ghc ==9.4.8
1111
ghc ==9.2.8 ghc ==9.0.2 ghc ==8.10.7 ghc ==8.8.4 ghc ==8.6.5
1212
ghc ==8.4.4 ghc ==8.2.2 ghc ==8.0.2
1313

0 commit comments

Comments
 (0)