Skip to content

Commit 90bc03a

Browse files
BodigrimBodigrim
committed
Regenerate CI
1 parent bca8d2e commit 90bc03a

File tree

2 files changed

+40
-26
lines changed

2 files changed

+40
-26
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 39 additions & 25 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.20240708
11+
# version: 0.19.20250801
1212
#
13-
# REGENDATA ("0.19.20240708",["github","cabal.project"])
13+
# REGENDATA ("0.19.20250801",["github","cabal.project"])
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,19 +28,24 @@ jobs:
2828
strategy:
2929
matrix:
3030
include:
31-
- compiler: ghc-9.10.1
31+
- compiler: ghc-9.12.2
3232
compilerKind: ghc
33-
compilerVersion: 9.10.1
33+
compilerVersion: 9.12.2
3434
setup-method: ghcup
3535
allow-failure: false
36-
- compiler: ghc-9.8.2
36+
- compiler: ghc-9.10.2
3737
compilerKind: ghc
38-
compilerVersion: 9.8.2
38+
compilerVersion: 9.10.2
3939
setup-method: ghcup
4040
allow-failure: false
41-
- compiler: ghc-9.6.6
41+
- compiler: ghc-9.8.4
4242
compilerKind: ghc
43-
compilerVersion: 9.6.6
43+
compilerVersion: 9.8.4
44+
setup-method: ghcup
45+
allow-failure: false
46+
- compiler: ghc-9.6.7
47+
compilerKind: ghc
48+
compilerVersion: 9.6.7
4449
setup-method: ghcup
4550
allow-failure: false
4651
- compiler: ghc-9.4.8
@@ -75,15 +80,29 @@ jobs:
7580
allow-failure: false
7681
fail-fast: false
7782
steps:
78-
- name: apt
83+
- name: apt-get install
7984
run: |
8085
apt-get update
8186
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
87+
- name: Install GHCup
88+
run: |
8289
mkdir -p "$HOME/.ghcup/bin"
83-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
90+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
8491
chmod a+x "$HOME/.ghcup/bin/ghcup"
92+
- name: Install cabal-install
93+
run: |
94+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
95+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
96+
- name: Install GHC (GHCup)
97+
if: matrix.setup-method == 'ghcup'
98+
run: |
8599
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
86-
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
101+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
102+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
103+
echo "HC=$HC" >> "$GITHUB_ENV"
104+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
105+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
87106
env:
88107
HCKIND: ${{ matrix.compilerKind }}
89108
HCNAME: ${{ matrix.compiler }}
@@ -94,21 +113,12 @@ jobs:
94113
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
95114
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
96115
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
97-
HCDIR=/opt/$HCKIND/$HCVER
98-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
99-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
100-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
101-
echo "HC=$HC" >> "$GITHUB_ENV"
102-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
103-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
104-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
105116
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
106117
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
107118
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
108119
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
109120
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
110121
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
111-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
112122
env:
113123
HCKIND: ${{ matrix.compilerKind }}
114124
HCNAME: ${{ matrix.compiler }}
@@ -160,8 +170,8 @@ jobs:
160170
- name: install cabal-docspec
161171
run: |
162172
mkdir -p $HOME/.cabal/bin
163-
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240703/cabal-docspec-0.0.0.20240703-x86_64-linux.xz > cabal-docspec.xz
164-
echo '48bf3b7fd2f7f0caa6162afee57a755be8523e7f467b694900eb420f5f9a7b76 cabal-docspec.xz' | sha256sum -c -
173+
curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20250606/cabal-docspec-0.0.0.20250606-x86_64-linux.xz > cabal-docspec.xz
174+
echo 'cc20bb5c19501b42bde77556bc419c7c0a5c8d1eb65663024d8a4e4c868bef25 cabal-docspec.xz' | sha256sum -c -
165175
xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec
166176
rm -f cabal-docspec.xz
167177
chmod a+x $HOME/.cabal/bin/cabal-docspec
@@ -192,7 +202,11 @@ jobs:
192202
touch cabal.project.local
193203
echo "packages: ${PKGDIR_poly}" >> cabal.project
194204
echo "package poly" >> cabal.project
195-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
205+
echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project
206+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package poly" >> cabal.project ; fi
207+
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
208+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package poly" >> cabal.project ; fi
209+
if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi
196210
cat >> cabal.project <<EOF
197211
constraints: semirings -unordered-containers
198212
constraints: quickcheck-classes -aeson -semigroupoids
@@ -239,8 +253,8 @@ jobs:
239253
rm -f cabal.project.local
240254
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
241255
- name: save cache
242-
uses: actions/cache/save@v4
243256
if: always()
257+
uses: actions/cache/save@v4
244258
with:
245259
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
246260
path: ~/.cabal/store

‎poly.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ copyright: 2019-2020 Andrew Lelechenko
1212
category: Math, Numerical
1313
build-type: Simple
1414
cabal-version: 2.0
15-
tested-with: GHC ==8.6.5 GHC ==8.8.4 GHC ==8.10.7 GHC ==9.0.2 GHC ==9.2.8 GHC ==9.4.8 GHC ==9.6.6 GHC ==9.8.2 GHC ==9.10.1
15+
tested-with: GHC ==8.6.5 GHC ==8.8.4 GHC ==8.10.7 GHC ==9.0.2 GHC ==9.2.8 GHC ==9.4.8 GHC ==9.6.7 GHC ==9.8.4 GHC ==9.10.2 GHC ==9.12.2
1616
extra-source-files:
1717
changelog.md
1818
README.md

0 commit comments

Comments
 (0)