Skip to content

Commit 616470d

Browse files
committed
Revision 4: Bump CI to GHC 9.12.0, filepath is relaxed
1 parent ee22eeb commit 616470d

File tree

3 files changed

+28
-26
lines changed

3 files changed

+28
-26
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.18.1.20240316
11+
# version: 0.19.20241021
1212
#
13-
# REGENDATA ("0.18.1.20240316",["github","resolv.cabal"])
13+
# REGENDATA ("0.19.20241021",["github","resolv.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,19 +32,24 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.10.0.20240313
35+
- compiler: ghc-9.12.20241014
3636
compilerKind: ghc
37-
compilerVersion: 9.10.0.20240313
37+
compilerVersion: 9.12.20241014
38+
setup-method: ghcup
39+
allow-failure: false
40+
- compiler: ghc-9.10.1
41+
compilerKind: ghc
42+
compilerVersion: 9.10.1
3843
setup-method: ghcup
3944
allow-failure: false
4045
- compiler: ghc-9.8.2
4146
compilerKind: ghc
4247
compilerVersion: 9.8.2
4348
setup-method: ghcup
4449
allow-failure: false
45-
- compiler: ghc-9.6.4
50+
- compiler: ghc-9.6.6
4651
compilerKind: ghc
47-
compilerVersion: 9.6.4
52+
compilerVersion: 9.6.6
4853
setup-method: ghcup
4954
allow-failure: false
5055
- compiler: ghc-9.4.8
@@ -99,11 +104,11 @@ jobs:
99104
apt-get update
100105
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
101106
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"
107+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
103108
chmod a+x "$HOME/.ghcup/bin/ghcup"
104109
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
105110
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
106-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.1 || (cat "$HOME"/.ghcup/logs/*.* && false)
111+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
107112
env:
108113
HCKIND: ${{ matrix.compilerKind }}
109114
HCNAME: ${{ matrix.compiler }}
@@ -121,12 +126,12 @@ jobs:
121126
echo "HC=$HC" >> "$GITHUB_ENV"
122127
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
123128
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
124-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.1 -vnormal+nowrap" >> "$GITHUB_ENV"
129+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
125130
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
126131
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
127132
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
128133
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
129-
if [ $((HCNUMVER >= 91000)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
134+
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
130135
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
131136
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
132137
env:
@@ -224,7 +229,7 @@ jobs:
224229
if $HEADHACKAGE; then
225230
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
226231
fi
227-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(binary|resolv)$/; }' >> cabal.project.local
232+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(resolv)$/; }' >> cabal.project.local
228233
cat cabal.project
229234
cat cabal.project.local
230235
- name: dump install plan

cabal.haskell-ci

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
branches: master
22

3-
distribution: jammy
4-
-- jammy (Ubuntu 22.04) needed for autoconf-2.71
5-
6-
ghcup-jobs: True
7-
-- hvr ppa does not support jammy
8-
9-
installed: +all -binary
10-
3+
-- distribution: jammy
4+
-- -- jammy (Ubuntu 22.04) needed for autoconf-2.71
5+
--
6+
-- ghcup-jobs: True
7+
-- -- hvr ppa does not support jammy
8+
--
9+
-- installed: +all -binary
10+
--
1111
-- -- Test core libraries in versions newer than shipped with GHC
1212
-- constraint-set containers-0.7
1313
-- constraints: containers >= 0.7

resolv.cabal

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cabal-version: 2.2
22

33
name: resolv
44
version: 0.2.0.2
5-
x-revision: 3
5+
x-revision: 4
66

77
synopsis: Domain Name Service (DNS) lookup via the libresolv standard library routines
88
description: {
@@ -56,9 +56,10 @@ extra-tmp-files: autom4te.cache
5656
cbits/hs_resolv_config.h
5757

5858
tested-with:
59-
GHC == 9.10.0
59+
GHC == 9.12.0
60+
GHC == 9.10.1
6061
GHC == 9.8.2
61-
GHC == 9.6.4
62+
GHC == 9.6.6
6263
GHC == 9.4.8
6364
GHC == 9.2.8
6465
GHC == 9.0.2
@@ -68,10 +69,6 @@ tested-with:
6869
GHC == 8.4.4
6970
GHC == 8.2.2
7071
GHC == 8.0.2
71-
-- Not supported by ghcup:
72-
-- GHC == 7.10.3
73-
-- GHC == 7.8.4
74-
-- GHC == 7.6.3
7572

7673
source-repository head
7774
type: git

0 commit comments

Comments
 (0)