Skip to content

Commit d6dfe67

Browse files
andreasabelandreasabel
committed
Bump Haskell-CI GHC 9.4.5 -> 9.4.7
1 parent ab07e6e commit d6dfe67

File tree

9 files changed

+28
-20
lines changed

9 files changed

+28
-20
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,20 @@
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.16.4
11+
# version: 0.17.20230911
1212
#
13-
# REGENDATA ("0.16.4",["github","cabal.project"])
13+
# REGENDATA ("0.17.20230911",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
1717
push:
1818
branches:
1919
- master
20-
- ci-*
2120
pull_request:
2221
branches:
2322
- master
24-
- ci-*
2523
jobs:
2624
linux:
2725
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -39,9 +37,9 @@ jobs:
3937
compilerVersion: 9.6.2
4038
setup-method: ghcup
4139
allow-failure: false
42-
- compiler: ghc-9.4.5
40+
- compiler: ghc-9.4.7
4341
compilerKind: ghc
44-
compilerVersion: 9.4.5
42+
compilerVersion: 9.4.7
4543
setup-method: ghcup
4644
allow-failure: false
4745
- compiler: ghc-9.2.8
@@ -112,7 +110,7 @@ jobs:
112110
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
113111
if [ "${{ matrix.setup-method }}" = ghcup ]; then
114112
mkdir -p "$HOME/.ghcup/bin"
115-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
113+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
116114
chmod a+x "$HOME/.ghcup/bin/ghcup"
117115
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
118116
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
@@ -122,7 +120,7 @@ jobs:
122120
apt-get update
123121
apt-get install -y "$HCNAME"
124122
mkdir -p "$HOME/.ghcup/bin"
125-
curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
123+
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
126124
chmod a+x "$HOME/.ghcup/bin/ghcup"
127125
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
128126
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
@@ -139,10 +137,12 @@ jobs:
139137
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
140138
HCDIR=/opt/$HCKIND/$HCVER
141139
if [ "${{ matrix.setup-method }}" = ghcup ]; then
142-
HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
140+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
141+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
142+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
143143
echo "HC=$HC" >> "$GITHUB_ENV"
144-
echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
145-
echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
144+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
145+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
146146
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
147147
else
148148
HC=$HCDIR/bin/$HCKIND
@@ -343,11 +343,15 @@ jobs:
343343
rm -f cabal.project.local
344344
- name: constraint set bytestring-0.12
345345
run: |
346+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' all --dry-run ; fi
347+
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then cabal-plan topo | sort ; fi
346348
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' --dependencies-only -j2 all ; fi
347349
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' all ; fi
348350
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='bytestring >= 0.12' all ; fi
349351
- name: constraint set no-lukko
350352
run: |
353+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='hackage-security -lukko' all --dry-run ; fi
354+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then cabal-plan topo | sort ; fi
351355
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='hackage-security -lukko' --dependencies-only -j2 all ; fi
352356
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='hackage-security -lukko' all ; fi
353357
- name: save cache

‎cabal.haskell-ci

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
branches: master ci-*
1+
branches: master
2+
3+
distribution: bionic
4+
-- Switching to focal (20.04) and higher would require dropping GHC < 7.10
5+
-- enabled: ghc >= 7.10
26

37
ghc-head: True
48

‎example-client/example-client.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ cabal-version: >=1.10
1313

1414
tested-with:
1515
GHC == 9.6.2
16-
GHC == 9.4.5
16+
GHC == 9.4.7
1717
GHC == 9.2.8
1818
GHC == 9.0.2
1919
GHC == 8.10.7

‎hackage-repo-tool/hackage-repo-tool.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ bug-reports: https://github.com/haskell/hackage-security/issues
2525

2626
tested-with:
2727
GHC == 9.6.2
28-
GHC == 9.4.5
28+
GHC == 9.4.7
2929
GHC == 9.2.8
3030
GHC == 9.0.2
3131
GHC == 8.10.7

‎hackage-root-tool/hackage-root-tool.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cabal-version: >=1.10
1717

1818
tested-with:
1919
GHC == 9.6.2
20-
GHC == 9.4.5
20+
GHC == 9.4.7
2121
GHC == 9.2.8
2222
GHC == 9.0.2
2323
GHC == 8.10.7

‎hackage-security-HTTP/hackage-security-HTTP.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ build-type: Simple
1919

2020
tested-with:
2121
GHC == 9.6.2
22-
GHC == 9.4.5
22+
GHC == 9.4.7
2323
GHC == 9.2.8
2424
GHC == 9.0.2
2525
GHC == 8.10.7

‎hackage-security-curl/hackage-security-curl.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ cabal-version: >=1.10
1717

1818
tested-with:
1919
GHC == 9.6.2
20-
GHC == 9.4.5
20+
GHC == 9.4.7
2121
GHC == 9.2.8
2222
GHC == 9.0.2
2323
GHC == 8.10.7

‎hackage-security-http-client/hackage-security-http-client.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ cabal-version: >=1.10
1616

1717
tested-with:
1818
GHC == 9.6.2
19-
GHC == 9.4.5
19+
GHC == 9.4.7
2020
GHC == 9.2.8
2121
GHC == 9.0.2
2222
GHC == 8.10.7

‎hackage-security/hackage-security.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ build-type: Simple
3333

3434
tested-with:
3535
GHC == 9.6.2
36-
GHC == 9.4.5
36+
GHC == 9.4.7
3737
GHC == 9.2.8
3838
GHC == 9.0.2
3939
GHC == 8.10.7

0 commit comments

Comments
 (0)