Skip to content

Commit 5a9e896

Browse files
committed
Try updating CI again
1 parent 1588def commit 5a9e896

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# This GitHub workflow config has been generated by a script via
22
#
3-
# haskell-ci 'github' '--config=cabal.haskell-ci' 'cabal.project'
3+
# haskell-ci 'github' '--config=cabal.haskell-ci' '--ghc-head' 'cabal.project'
44
#
55
# To regenerate the script (for example after adjusting tested-with) run
66
#
77
# haskell-ci regenerate
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.15.20220620
11+
# version: 0.15.20220826
1212
#
13-
# REGENDATA ("0.15.20220620",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.15.20220826",["github","--config=cabal.haskell-ci","--ghc-head","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,11 +32,11 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.4.0.20220523
35+
- compiler: ghc-9.4.2
3636
compilerKind: ghc
37-
compilerVersion: 9.4.0.20220523
37+
compilerVersion: 9.4.2
3838
setup-method: ghcup
39-
allow-failure: true
39+
allow-failure: false
4040
- compiler: ghc-9.2.2
4141
compilerKind: ghc
4242
compilerVersion: 9.2.2
@@ -85,7 +85,7 @@ jobs:
8585
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
8686
if [ "${{ matrix.setup-method }}" = ghcup ]; then
8787
mkdir -p "$HOME/.ghcup/bin"
88-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
88+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
8989
chmod a+x "$HOME/.ghcup/bin/ghcup"
9090
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
9191
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
@@ -95,7 +95,7 @@ jobs:
9595
apt-get update
9696
apt-get install -y "$HCNAME"
9797
mkdir -p "$HOME/.ghcup/bin"
98-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
98+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
9999
chmod a+x "$HOME/.ghcup/bin/ghcup"
100100
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
101101
fi
@@ -128,7 +128,7 @@ jobs:
128128
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
129129
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
130130
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
131-
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
131+
if [ $((HCNUMVER > 90402)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
132132
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
133133
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
134134
env:

containers-tests/containers-tests.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extra-source-files:
2626
benchmarks/LookupGE/*.hs
2727

2828
tested-with:
29-
GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.2 || ==9.4.1
29+
GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.2 || ==9.4.2
3030

3131
source-repository head
3232
type: git

containers/containers.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extra-source-files:
2525
include/containers.h
2626
changelog.md
2727

28-
tested-with: GHC==9.4.1, GHC==9.2.2, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2
28+
tested-with: GHC==9.4.2, GHC==9.2.2, GHC==9.0.2, GHC==8.10.7, GHC==8.8.4, GHC==8.6.5, GHC==8.4.4, GHC==8.2.2, GHC==8.0.2
2929

3030
source-repository head
3131
type: git

0 commit comments

Comments
 (0)