Skip to content

Commit cedde4c

Browse files
andreasabelandreasabel
committed
Bump Haskell CI (original!) to latest minor GHC versions (#2187)
1 parent 5bb2a86 commit cedde4c

File tree

3 files changed

+21
-37
lines changed

3 files changed

+21
-37
lines changed

‎.github/workflows/ci-ubuntu.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
branches:
99
- master
1010
- experimental
11+
merge_group:
1112

1213
########################################################################
1314
## CONFIGURATION
@@ -71,16 +72,15 @@ jobs:
7172

7273
- name: Initialise variables
7374
run: |
74-
if [[ '${{ github.ref }}' == 'refs/heads/master' \
75-
|| '${{ github.base_ref }}' == 'master' ]]; then
76-
# Pick Agda version for master
77-
echo "AGDA_COMMIT=tags/v2.6.4" >> $GITHUB_ENV;
78-
echo "AGDA_HTML_DIR=html/master" >> $GITHUB_ENV
79-
elif [[ '${{ github.ref }}' == 'refs/heads/experimental' \
80-
|| '${{ github.base_ref }}' == 'experimental' ]]; then
75+
if [[ '${{ github.ref }}' == 'refs/heads/experimental' \
76+
|| '${{ github.base_ref }}' == 'experimental' ]]; then
8177
# Pick Agda version for experimental
8278
echo "AGDA_COMMIT=4d36cb37f8bfb765339b808b13356d760aa6f0ec" >> $GITHUB_ENV;
8379
echo "AGDA_HTML_DIR=html/experimental" >> $GITHUB_ENV
80+
else
81+
# Pick Agda version for master
82+
echo "AGDA_COMMIT=tags/v2.6.4" >> $GITHUB_ENV;
83+
echo "AGDA_HTML_DIR=html/master" >> $GITHUB_ENV
8484
fi
8585
8686
if [[ '${{ github.ref }}' == 'refs/heads/master' \

‎.github/workflows/haskell-ci.yml

+11-27
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.17.20230824
11+
# version: 0.17.20231010
1212
#
13-
# REGENDATA ("0.17.20230824",["github","--no-cabal-check","agda-stdlib-utils.cabal"])
13+
# REGENDATA ("0.17.20231010",["github","--no-cabal-check","agda-stdlib-utils.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,6 +32,7 @@ on:
3232
- agda-stdlib-utils.cabal
3333
- cabal.haskell-ci
3434
- "*.hs"
35+
merge_group:
3536
jobs:
3637
linux:
3738
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -44,19 +45,19 @@ jobs:
4445
strategy:
4546
matrix:
4647
include:
47-
- compiler: ghc-9.8.0.20230822
48+
- compiler: ghc-9.8.1
4849
compilerKind: ghc
49-
compilerVersion: 9.8.0.20230822
50+
compilerVersion: 9.8.1
5051
setup-method: ghcup
51-
allow-failure: true
52-
- compiler: ghc-9.6.2
52+
allow-failure: false
53+
- compiler: ghc-9.6.3
5354
compilerKind: ghc
54-
compilerVersion: 9.6.2
55+
compilerVersion: 9.6.3
5556
setup-method: ghcup
5657
allow-failure: false
57-
- compiler: ghc-9.4.6
58+
- compiler: ghc-9.4.7
5859
compilerKind: ghc
59-
compilerVersion: 9.4.6
60+
compilerVersion: 9.4.7
6061
setup-method: ghcup
6162
allow-failure: false
6263
- compiler: ghc-9.2.8
@@ -94,7 +95,6 @@ jobs:
9495
mkdir -p "$HOME/.ghcup/bin"
9596
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
9697
chmod a+x "$HOME/.ghcup/bin/ghcup"
97-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
9898
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
9999
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
100100
else
@@ -104,7 +104,6 @@ jobs:
104104
mkdir -p "$HOME/.ghcup/bin"
105105
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup"
106106
chmod a+x "$HOME/.ghcup/bin/ghcup"
107-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
108107
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
109108
fi
110109
env:
@@ -138,7 +137,7 @@ jobs:
138137
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
139138
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
140139
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
141-
if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
140+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
142141
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
143142
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
144143
env:
@@ -167,18 +166,6 @@ jobs:
167166
repository hackage.haskell.org
168167
url: http://hackage.haskell.org/
169168
EOF
170-
if $HEADHACKAGE; then
171-
cat >> $CABAL_CONFIG <<EOF
172-
repository head.hackage.ghc.haskell.org
173-
url: https://ghc.gitlab.haskell.org/head.hackage/
174-
secure: True
175-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
176-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
177-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
178-
key-threshold: 3
179-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
180-
EOF
181-
fi
182169
cat >> $CABAL_CONFIG <<EOF
183170
program-default-options
184171
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -230,9 +217,6 @@ jobs:
230217
echo " ghc-options: -Werror=missing-methods" >> cabal.project
231218
cat >> cabal.project <<EOF
232219
EOF
233-
if $HEADHACKAGE; then
234-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
235-
fi
236220
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(agda-stdlib-utils)$/; }' >> cabal.project.local
237221
cat cabal.project
238222
cat cabal.project.local

‎agda-stdlib-utils.cabal

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

88
tested-with:
9-
GHC == 9.8.0
10-
GHC == 9.6.2
11-
GHC == 9.4.6
9+
GHC == 9.8.1
10+
GHC == 9.6.3
11+
GHC == 9.4.7
1212
GHC == 9.2.8
1313
GHC == 9.0.2
1414
GHC == 8.10.7

0 commit comments

Comments
 (0)