Skip to content

Commit 2454e5f

Browse files
svenpannesvenpanne
authored
Merge pull request #50 from andreasabel/ci-9.10
Bump Haskell CI to GHC 9.10
2 parents 889f2c2 + 77368d9 commit 2454e5f

File tree

2 files changed

+43
-56
lines changed

2 files changed

+43
-56
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 33 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# haskell-ci regenerate
88
#
9-
# For more information, see https://github.com/haskell-CI/haskell-ci
9+
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.17.20240109
11+
# version: 0.19.20240703
1212
#
13-
# REGENDATA ("0.17.20240109",["github","OpenGLRaw.cabal","--distribution=focal","--submodules","--branches","master","--output=.github/workflows/haskell-ci.yml","--apt=freeglut3-dev"])
13+
# REGENDATA ("0.19.20240703",["github","OpenGLRaw.cabal","--distribution=focal","--submodules","--branches","master","--output=.github/workflows/haskell-ci.yml","--apt=freeglut3-dev"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,14 +32,19 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.8.1
35+
- compiler: ghc-9.10.1
3636
compilerKind: ghc
37-
compilerVersion: 9.8.1
37+
compilerVersion: 9.10.1
3838
setup-method: ghcup
3939
allow-failure: false
40-
- compiler: ghc-9.6.4
40+
- compiler: ghc-9.8.2
4141
compilerKind: ghc
42-
compilerVersion: 9.6.4
42+
compilerVersion: 9.8.2
43+
setup-method: ghcup
44+
allow-failure: false
45+
- compiler: ghc-9.6.6
46+
compilerKind: ghc
47+
compilerVersion: 9.6.6
4348
setup-method: ghcup
4449
allow-failure: false
4550
- compiler: ghc-9.4.8
@@ -65,51 +70,41 @@ jobs:
6570
- compiler: ghc-8.8.4
6671
compilerKind: ghc
6772
compilerVersion: 8.8.4
68-
setup-method: hvr-ppa
73+
setup-method: ghcup
6974
allow-failure: false
7075
- compiler: ghc-8.6.5
7176
compilerKind: ghc
7277
compilerVersion: 8.6.5
73-
setup-method: hvr-ppa
78+
setup-method: ghcup
7479
allow-failure: false
7580
- compiler: ghc-8.4.4
7681
compilerKind: ghc
7782
compilerVersion: 8.4.4
78-
setup-method: hvr-ppa
83+
setup-method: ghcup
7984
allow-failure: false
8085
- compiler: ghc-8.2.2
8186
compilerKind: ghc
8287
compilerVersion: 8.2.2
83-
setup-method: hvr-ppa
88+
setup-method: ghcup
8489
allow-failure: false
8590
- compiler: ghc-8.0.2
8691
compilerKind: ghc
8792
compilerVersion: 8.0.2
88-
setup-method: hvr-ppa
93+
setup-method: ghcup
8994
allow-failure: false
9095
fail-fast: false
9196
steps:
9297
- name: apt
9398
run: |
9499
apt-get update
95-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
96-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
97-
mkdir -p "$HOME/.ghcup/bin"
98-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
99-
chmod a+x "$HOME/.ghcup/bin/ghcup"
100-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
101-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
102-
apt-get update
103-
apt-get install -y freeglut3-dev
104-
else
105-
apt-add-repository -y 'ppa:hvr/ghc'
106-
apt-get update
107-
apt-get install -y "$HCNAME" freeglut3-dev
108-
mkdir -p "$HOME/.ghcup/bin"
109-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
110-
chmod a+x "$HOME/.ghcup/bin/ghcup"
111-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
112-
fi
100+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
101+
mkdir -p "$HOME/.ghcup/bin"
102+
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
103+
chmod a+x "$HOME/.ghcup/bin/ghcup"
104+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
105+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
106+
apt-get update
107+
apt-get install -y freeglut3-dev
113108
env:
114109
HCKIND: ${{ matrix.compilerKind }}
115110
HCNAME: ${{ matrix.compiler }}
@@ -121,22 +116,13 @@ jobs:
121116
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
122117
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
123118
HCDIR=/opt/$HCKIND/$HCVER
124-
if [ "${{ matrix.setup-method }}" = ghcup ]; then
125-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
126-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
127-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
128-
echo "HC=$HC" >> "$GITHUB_ENV"
129-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
130-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
131-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
132-
else
133-
HC=$HCDIR/bin/$HCKIND
134-
echo "HC=$HC" >> "$GITHUB_ENV"
135-
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
136-
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
137-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
138-
fi
139-
119+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
120+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
121+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
122+
echo "HC=$HC" >> "$GITHUB_ENV"
123+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
124+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
125+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
140126
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
141127
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
142128
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -222,7 +208,7 @@ jobs:
222208
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
223209
cat >> cabal.project <<EOF
224210
EOF
225-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(OpenGLRaw)$/; }' >> cabal.project.local
211+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(OpenGLRaw)$/; }' >> cabal.project.local
226212
cat cabal.project
227213
cat cabal.project.local
228214
- name: dump install plan

‎OpenGLRaw.cabal

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,18 @@ description:
3030
and <http://www.opengl.org/registry/>.
3131
build-type: Simple
3232
tested-with:
33-
GHC == 8.0.2
33+
GHC == 9.10.1
34+
GHC == 9.8.2
35+
GHC == 9.6.6
36+
GHC == 9.4.8
37+
GHC == 9.2.8
38+
GHC == 9.0.2
3439
GHC == 8.10.7
35-
GHC == 8.2.2
36-
GHC == 8.4.4
37-
GHC == 8.6.5
3840
GHC == 8.8.4
39-
GHC == 9.0.2
40-
GHC == 9.2.8
41-
GHC == 9.4.8
42-
GHC == 9.6.4
43-
GHC == 9.8.1
41+
GHC == 8.6.5
42+
GHC == 8.4.4
43+
GHC == 8.2.2
44+
GHC == 8.0.2
4445
extra-doc-files:
4546
CHANGELOG.md
4647
README.md

0 commit comments

Comments
 (0)