Skip to content

Commit a787006

Browse files
andreasabelandreasabel
authoredJan 18, 2025··
Update CI (#2544)
* .cabal: allow base-4.21, add GHC 9.12.1 to Haskell-CI * CI: bump GHC to 9.10.1
1 parent eded674 commit a787006

File tree

3 files changed

+37
-26
lines changed

3 files changed

+37
-26
lines changed
 

‎.github/workflows/ci-ubuntu.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ on:
4848
########################################################################
4949

5050
env:
51-
GHC_VERSION: 9.8.2
52-
CABAL_VERSION: 3.10.3.0
51+
GHC_VERSION: 9.10.1
52+
CABAL_VERSION: 3.12.1.0
5353
CABAL_V1_INSTALL: cabal v1-install --ghc-options='-O1 +RTS -M6G -RTS'
5454
CABAL_INSTALL: cabal install --overwrite-policy=always --ghc-options='-O1 +RTS -M6G -RTS'
5555
AGDA: agda -Werror +RTS -M5G -H3.5G -A128M -RTS -i. -isrc -idoc
@@ -80,7 +80,7 @@ jobs:
8080
echo "AGDA_HTML_DIR=html/experimental" >> "${GITHUB_ENV}"
8181
else
8282
# Pick Agda version for master
83-
echo "AGDA_COMMIT=tags/v2.7.0" >> "${GITHUB_ENV}";
83+
echo "AGDA_COMMIT=tags/v2.7.0.1" >> "${GITHUB_ENV}";
8484
echo "AGDA_HTML_DIR=html/master" >> "${GITHUB_ENV}"
8585
fi
8686
@@ -191,7 +191,7 @@ jobs:
191191
./landing.sh
192192
193193
- name: Deploy HTML
194-
uses: JamesIves/github-pages-deploy-action@4.1.3
194+
uses: JamesIves/github-pages-deploy-action@v4
195195
if: success() && env.AGDA_DEPLOY
196196

197197
with:

‎.github/workflows/haskell-ci.yml

+29-19
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.20240514
11+
# version: 0.19.20241223
1212
#
13-
# REGENDATA ("0.19.20240514",["github","--no-cabal-check","agda-stdlib-utils.cabal"])
13+
# REGENDATA ("0.19.20241223",["github","--no-cabal-check","agda-stdlib-utils.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -45,19 +45,24 @@ jobs:
4545
strategy:
4646
matrix:
4747
include:
48+
- compiler: ghc-9.12.1
49+
compilerKind: ghc
50+
compilerVersion: 9.12.1
51+
setup-method: ghcup
52+
allow-failure: false
4853
- compiler: ghc-9.10.1
4954
compilerKind: ghc
5055
compilerVersion: 9.10.1
5156
setup-method: ghcup
5257
allow-failure: false
53-
- compiler: ghc-9.8.2
58+
- compiler: ghc-9.8.4
5459
compilerKind: ghc
55-
compilerVersion: 9.8.2
60+
compilerVersion: 9.8.4
5661
setup-method: ghcup
5762
allow-failure: false
58-
- compiler: ghc-9.6.5
63+
- compiler: ghc-9.6.6
5964
compilerKind: ghc
60-
compilerVersion: 9.6.5
65+
compilerVersion: 9.6.6
6166
setup-method: ghcup
6267
allow-failure: false
6368
- compiler: ghc-9.4.8
@@ -92,15 +97,29 @@ jobs:
9297
allow-failure: false
9398
fail-fast: false
9499
steps:
95-
- name: apt
100+
- name: apt-get install
96101
run: |
97102
apt-get update
98103
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
104+
- name: Install GHCup
105+
run: |
99106
mkdir -p "$HOME/.ghcup/bin"
100-
curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
107+
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
101108
chmod a+x "$HOME/.ghcup/bin/ghcup"
109+
- name: Install cabal-install
110+
run: |
111+
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
112+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
113+
- name: Install GHC (GHCup)
114+
if: matrix.setup-method == 'ghcup'
115+
run: |
102116
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
103-
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
117+
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
118+
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
119+
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
120+
echo "HC=$HC" >> "$GITHUB_ENV"
121+
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
122+
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
104123
env:
105124
HCKIND: ${{ matrix.compilerKind }}
106125
HCNAME: ${{ matrix.compiler }}
@@ -111,21 +130,12 @@ jobs:
111130
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
112131
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
113132
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
114-
HCDIR=/opt/$HCKIND/$HCVER
115-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
116-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
117-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
118-
echo "HC=$HC" >> "$GITHUB_ENV"
119-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
120-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
121-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
122133
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
123134
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
124135
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
125136
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
126137
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
127138
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
128-
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
129139
env:
130140
HCKIND: ${{ matrix.compilerKind }}
131141
HCNAME: ${{ matrix.compiler }}
@@ -234,8 +244,8 @@ jobs:
234244
rm -f cabal.project.local
235245
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
236246
- name: save cache
237-
uses: actions/cache/save@v4
238247
if: always()
248+
uses: actions/cache/save@v4
239249
with:
240250
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
241251
path: ~/.cabal/store

‎agda-stdlib-utils.cabal

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ description: Helper programs for setting up the Agda standard library.
66
license: MIT
77

88
tested-with:
9+
GHC == 9.12.1
910
GHC == 9.10.1
10-
GHC == 9.8.2
11-
GHC == 9.6.5
11+
GHC == 9.8.4
12+
GHC == 9.6.6
1213
GHC == 9.4.8
1314
GHC == 9.2.8
1415
GHC == 9.0.2
@@ -24,7 +25,7 @@ common common-build-parameters
2425
PatternSynonyms
2526

2627
build-depends:
27-
base >= 4.12.0.0 && < 4.21
28+
base >= 4.12.0.0 && < 4.22
2829
, filemanip >= 0.3.6.2 && < 0.4
2930

3031
executable GenerateEverything

0 commit comments

Comments
 (0)
Please sign in to comment.