Skip to content

Commit 0b3cf9d

Browse files
committed
Regenerate CI
1 parent e64674f commit 0b3cf9d

File tree

2 files changed

+29
-19
lines changed

2 files changed

+29
-19
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20240702
11+
# version: 0.19.20250216
1212
#
13-
# REGENDATA ("0.19.20240702",["github","arithmoi.cabal"])
13+
# REGENDATA ("0.19.20250216",["github","arithmoi.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
linux:
2121
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-24.04
2323
timeout-minutes:
2424
60
2525
container:
@@ -28,14 +28,19 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31+
- compiler: ghc-9.12.1
32+
compilerKind: ghc
33+
compilerVersion: 9.12.1
34+
setup-method: ghcup
35+
allow-failure: false
3136
- compiler: ghc-9.10.1
3237
compilerKind: ghc
3338
compilerVersion: 9.10.1
3439
setup-method: ghcup
3540
allow-failure: false
36-
- compiler: ghc-9.8.2
41+
- compiler: ghc-9.8.4
3742
compilerKind: ghc
38-
compilerVersion: 9.8.2
43+
compilerVersion: 9.8.4
3944
setup-method: ghcup
4045
allow-failure: false
4146
- compiler: ghc-9.6.6
@@ -60,15 +65,29 @@ jobs:
6065
allow-failure: false
6166
fail-fast: false
6267
steps:
63-
- name: apt
68+
- name: apt-get install
6469
run: |
6570
apt-get update
6671
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
72+
- name: Install GHCup
73+
run: |
6774
mkdir -p "$HOME/.ghcup/bin"
68-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
75+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
6976
chmod a+x "$HOME/.ghcup/bin/ghcup"
70-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
77+
- name: Install cabal-install
78+
run: |
7179
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
80+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
81+
- name: Install GHC (GHCup)
82+
if: matrix.setup-method == 'ghcup'
83+
run: |
84+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
85+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
86+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
87+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
88+
echo "HC=$HC" >> "$GITHUB_ENV"
89+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
90+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
7291
env:
7392
HCKIND: ${{ matrix.compilerKind }}
7493
HCNAME: ${{ matrix.compiler }}
@@ -79,21 +98,12 @@ jobs:
7998
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
8099
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
81100
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
82-
HCDIR=/opt/$HCKIND/$HCVER
83-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
84-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
85-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
86-
echo "HC=$HC" >> "$GITHUB_ENV"
87-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
88-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
89-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
90101
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
91102
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
92103
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
93104
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
94105
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
95106
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
96-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
97107
env:
98108
HCKIND: ${{ matrix.compilerKind }}
99109
HCNAME: ${{ matrix.compiler }}
@@ -209,8 +219,8 @@ jobs:
209219
rm -f cabal.project.local
210220
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
211221
- name: save cache
212-
uses: actions/cache/save@v4
213222
if: always()
223+
uses: actions/cache/save@v4
214224
with:
215225
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
216226
path: ~/.cabal/store

arithmoi.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ description:
1717
powers (integer roots and tests, modular exponentiation).
1818
category: Math, Algorithms, Number Theory
1919
author: Andrew Lelechenko, Daniel Fischer
20-
tested-with: GHC ==9.0.2 GHC ==9.2.8 GHC ==9.4.8 GHC ==9.6.6 GHC ==9.8.2 GHC ==9.10.1
20+
tested-with: GHC ==9.0.2 GHC ==9.2.8 GHC ==9.4.8 GHC ==9.6.6 GHC ==9.8.4 GHC ==9.10.1 GHC ==9.12.1
2121
extra-doc-files:
2222
changelog.md
2323

0 commit comments

Comments
 (0)