Skip to content

Commit eb34da1

Browse files
authored
Merge pull request #158 from haskell/ghc-9.12.1
v4000.4.1-r5: bump base for GHC-9.12
2 parents c527255 + 8c248e8 commit eb34da1

File tree

2 files changed

+32
-21
lines changed

2 files changed

+32
-21
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 28 additions & 18 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/andreasabel/haskell-ci
9+
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20240703
11+
# version: 0.19.20241223
1212
#
13-
# REGENDATA ("0.19.20240703",["github","HTTP.cabal"])
13+
# REGENDATA ("0.19.20241223",["github","HTTP.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,14 +32,19 @@ 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
4550
- compiler: ghc-9.6.6
@@ -89,15 +94,29 @@ jobs:
8994
allow-failure: false
9095
fail-fast: false
9196
steps:
92-
- name: apt
97+
- name: apt-get install
9398
run: |
9499
apt-get update
95100
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
101+
- name: Install GHCup
102+
run: |
96103
mkdir -p "$HOME/.ghcup/bin"
97-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
104+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
98105
chmod a+x "$HOME/.ghcup/bin/ghcup"
106+
- name: Install cabal-install
107+
run: |
108+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
109+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
110+
- name: Install GHC (GHCup)
111+
if: matrix.setup-method == 'ghcup'
112+
run: |
99113
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
100-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
114+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
115+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
116+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
117+
echo "HC=$HC" >> "$GITHUB_ENV"
118+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
119+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
101120
env:
102121
HCKIND: ${{ matrix.compilerKind }}
103122
HCNAME: ${{ matrix.compiler }}
@@ -108,21 +127,12 @@ jobs:
108127
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
109128
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
110129
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
111-
HCDIR=/opt/$HCKIND/$HCVER
112-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
113-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
114-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
115-
echo "HC=$HC" >> "$GITHUB_ENV"
116-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
117-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
118-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
119130
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
120131
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
121132
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
122133
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
123134
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
124135
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
125-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
126136
env:
127137
HCKIND: ${{ matrix.compilerKind }}
128138
HCNAME: ${{ matrix.compiler }}
@@ -238,8 +248,8 @@ jobs:
238248
rm -f cabal.project.local
239249
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
240250
- name: save cache
241-
uses: actions/cache/save@v4
242251
if: always()
252+
uses: actions/cache/save@v4
243253
with:
244254
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
245255
path: ~/.cabal/store

HTTP.cabal

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Cabal-Version: >= 1.10
22
Name: HTTP
33
Version: 4000.4.1
4-
x-revision: 4
4+
x-revision: 5
55
Build-type: Simple
66
License: BSD3
77
License-file: LICENSE
@@ -58,8 +58,9 @@ Description:
5858
Extra-Source-Files: CHANGES
5959

6060
tested-with:
61+
GHC == 9.12.1
6162
GHC == 9.10.1
62-
GHC == 9.8.2
63+
GHC == 9.8.4
6364
GHC == 9.6.6
6465
GHC == 9.4.8
6566
GHC == 9.2.8
@@ -120,7 +121,7 @@ Library
120121
-- note the test harness constraints should be kept in sync with these
121122
-- where dependencies are shared
122123
build-depends:
123-
base >= 4.6.0.0 && < 4.21
124+
base >= 4.6.0.0 && < 4.22
124125
, array >= 0.3.0.2 && < 0.6
125126
, bytestring >= 0.9.1.5 && < 0.13
126127
, parsec >= 2.0 && < 3.2

0 commit comments

Comments
 (0)