Skip to content

Commit 88beb68

Browse files
committed
CI: regenerate for ghc 9.12.1
1 parent 34b1e12 commit 88beb68

File tree

2 files changed

+38
-19
lines changed

2 files changed

+38
-19
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 37 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.20241021
11+
# version: 0.19.20241121
1212
#
13-
# REGENDATA ("0.19.20241021",["github","vector-algorithms.cabal"])
13+
# REGENDATA ("0.19.20241121",["github","vector-algorithms.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,10 +32,10 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.12.20241014
35+
- compiler: ghc-9.12.0.20241114
3636
compilerKind: ghc
37-
compilerVersion: 9.12.20241014
38-
setup-method: ghcup
37+
compilerVersion: 9.12.0.20241114
38+
setup-method: ghcup-prerelease
3939
allow-failure: false
4040
- compiler: ghc-9.10.1
4141
compilerKind: ghc
@@ -99,41 +99,60 @@ jobs:
9999
allow-failure: false
100100
fail-fast: false
101101
steps:
102-
- name: apt
102+
- name: apt-get install
103103
run: |
104104
apt-get update
105105
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev
106+
- name: Install GHCup
107+
run: |
106108
mkdir -p "$HOME/.ghcup/bin"
107109
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
108110
chmod a+x "$HOME/.ghcup/bin/ghcup"
109-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
110-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
111+
- name: Install cabal-install
112+
run: |
111113
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
114+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115+
- name: Install GHC (GHCup)
116+
if: matrix.setup-method == 'ghcup'
117+
run: |
118+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
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"
112125
env:
113126
HCKIND: ${{ matrix.compilerKind }}
114127
HCNAME: ${{ matrix.compiler }}
115128
HCVER: ${{ matrix.compilerVersion }}
116-
- name: Set PATH and environment variables
129+
- name: Install GHC (GHCup prerelease)
130+
if: matrix.setup-method == 'ghcup-prerelease'
117131
run: |
118-
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
119-
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
120-
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
121-
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
122-
HCDIR=/opt/$HCKIND/$HCVER
132+
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
133+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
123134
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
124135
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
125136
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
126137
echo "HC=$HC" >> "$GITHUB_ENV"
127138
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
128139
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
129-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
140+
env:
141+
HCKIND: ${{ matrix.compilerKind }}
142+
HCNAME: ${{ matrix.compiler }}
143+
HCVER: ${{ matrix.compilerVersion }}
144+
- name: Set PATH and environment variables
145+
run: |
146+
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
147+
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
148+
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
149+
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
130150
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
131151
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
132152
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
133153
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
134154
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
135155
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
136-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
137156
env:
138157
HCKIND: ${{ matrix.compilerKind }}
139158
HCNAME: ${{ matrix.compiler }}
@@ -264,8 +283,8 @@ jobs:
264283
rm -f cabal.project.local
265284
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
266285
- name: save cache
267-
uses: actions/cache/save@v4
268286
if: always()
287+
uses: actions/cache/save@v4
269288
with:
270289
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
271290
path: ~/.cabal/store

vector-algorithms.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ build-type: Simple
1818
extra-source-files: CHANGELOG.md
1919

2020
tested-with:
21-
GHC == 9.12.0
21+
GHC == 9.12.1
2222
GHC == 9.10.1
2323
GHC == 9.8.2
2424
GHC == 9.6.3

0 commit comments

Comments
 (0)