Skip to content

Commit 38bd240

Browse files
committed
Bump Haskell CI to GHC 9.8.1; bump deploy action; only branch release-1.7.3-base
Restricting to branch release-1.7.3-base will hopefully stop duplicate CI runs.
1 parent 3f869a3 commit 38bd240

File tree

3 files changed

+18
-25
lines changed

3 files changed

+18
-25
lines changed

.github/workflows/ci-ubuntu.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
name: Ubuntu build
22
on:
33
push:
4+
branches:
5+
- release-1.7.3-base
46
pull_request:
7+
branches:
8+
- release-1.7.3-base
59

610
########################################################################
711
## CONFIGURATION
@@ -167,7 +171,7 @@ jobs:
167171

168172

169173
- name: Deploy HTML
170-
uses: JamesIves/github-pages-deploy-action@4.1.3
174+
uses: JamesIves/github-pages-deploy-action@v4
171175
if: ${{ success() && env.AGDA_DEPLOY }}
172176

173177
with:

.github/workflows/haskell-ci.yml

+12-23
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@
88
#
99
# For more information, see https://github.com/andreasabel/haskell-ci
1010
#
11-
# version: 0.17.20231002
11+
# version: 0.17.20231010
1212
#
13-
# REGENDATA ("0.17.20231002",["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:
17-
- push
18-
- pull_request
17+
push:
18+
branches:
19+
- release-1.7.3-base
20+
pull_request:
21+
branches:
22+
- release-1.7.3-base
1923
jobs:
2024
linux:
2125
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -28,11 +32,11 @@ jobs:
2832
strategy:
2933
matrix:
3034
include:
31-
- compiler: ghc-9.8.0.20230929
35+
- compiler: ghc-9.8.1
3236
compilerKind: ghc
33-
compilerVersion: 9.8.0.20230929
37+
compilerVersion: 9.8.1
3438
setup-method: ghcup
35-
allow-failure: true
39+
allow-failure: false
3640
- compiler: ghc-9.6.3
3741
compilerKind: ghc
3842
compilerVersion: 9.6.3
@@ -137,7 +141,7 @@ jobs:
137141
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
138142
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
139143
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
140-
if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
144+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
141145
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
142146
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
143147
env:
@@ -166,18 +170,6 @@ jobs:
166170
repository hackage.haskell.org
167171
url: http://hackage.haskell.org/
168172
EOF
169-
if $HEADHACKAGE; then
170-
cat >> $CABAL_CONFIG <<EOF
171-
repository head.hackage.ghc.haskell.org
172-
url: https://ghc.gitlab.haskell.org/head.hackage/
173-
secure: True
174-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
175-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
176-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
177-
key-threshold: 3
178-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
179-
EOF
180-
fi
181173
cat >> $CABAL_CONFIG <<EOF
182174
program-default-options
183175
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -229,9 +221,6 @@ jobs:
229221
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
230222
cat >> cabal.project <<EOF
231223
EOF
232-
if $HEADHACKAGE; then
233-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
234-
fi
235224
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(agda-stdlib-utils)$/; }' >> cabal.project.local
236225
cat cabal.project
237226
cat cabal.project.local

agda-stdlib-utils.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tested-with: GHC == 8.0.2
1414
GHC == 9.2.8
1515
GHC == 9.4.7
1616
GHC == 9.6.3
17-
GHC == 9.8.0
17+
GHC == 9.8.1
1818

1919
executable GenerateEverything
2020
hs-source-dirs: .

0 commit comments

Comments
 (0)