on master help sign in
Update CI
40abe51Andrzej Rybczak
.github/workflows/haskell-ci.yml+12−26
@@ -8,9 +8,9 @@
8#
8#
9# For more information, see https://github.com/haskell-CI/haskell-ci
9# For more information, see https://github.com/haskell-CI/haskell-ci
10#
10#
11−# version: 0.13.20210912
11+# version: 0.13.20211030
12#
12#
13−# REGENDATA ("0.13.20210912",["github","--config=cabal.haskell-ci","cabal.project"])
13+# REGENDATA ("0.13.20211030",["github","--config=cabal.haskell-ci","cabal.project"])
14#
14#
15name: Haskell-CI
15name: Haskell-CI
16on:
16on:
@@ -30,11 +30,11 @@ jobs:
30 strategy:
30 strategy:
31 matrix:
31 matrix:
32 include:
32 include:
33− - compiler: ghc-9.2.0.20210821
33+ - compiler: ghc-9.2.1
34 compilerKind: ghc
34 compilerKind: ghc
35− compilerVersion: 9.2.0.20210821
35+ compilerVersion: 9.2.1
36 setup-method: ghcup
36 setup-method: ghcup
37− allow-failure: true
37+ allow-failure: false
38 - compiler: ghc-9.0.1
38 - compiler: ghc-9.0.1
39 compilerKind: ghc
39 compilerKind: ghc
40 compilerVersion: 9.0.1
40 compilerVersion: 9.0.1
@@ -58,18 +58,18 @@ jobs:
58 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
58 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
59 if [ "${{ matrix.setup-method }}" = ghcup ]; then
59 if [ "${{ matrix.setup-method }}" = ghcup ]; then
60 mkdir -p "$HOME/.ghcup/bin"
60 mkdir -p "$HOME/.ghcup/bin"
61− curl -sL https://downloads.haskell.org/ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2 > "$HOME/.ghcup/bin/ghcup"
61+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
62 chmod a+x "$HOME/.ghcup/bin/ghcup"
62 chmod a+x "$HOME/.ghcup/bin/ghcup"
63 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
63 "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
64− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.0.0
64+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
65 else
65 else
66 apt-add-repository -y 'ppa:hvr/ghc'
66 apt-add-repository -y 'ppa:hvr/ghc'
67 apt-get update
67 apt-get update
68 apt-get install -y "$HCNAME"
68 apt-get install -y "$HCNAME"
69 mkdir -p "$HOME/.ghcup/bin"
69 mkdir -p "$HOME/.ghcup/bin"
70− curl -sL https://downloads.haskell.org/ghcup/0.1.16.2/x86_64-linux-ghcup-0.1.16.2 > "$HOME/.ghcup/bin/ghcup"
70+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
71 chmod a+x "$HOME/.ghcup/bin/ghcup"
71 chmod a+x "$HOME/.ghcup/bin/ghcup"
72− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.0.0
72+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
73 fi
73 fi
74 env:
74 env:
75 HCKIND: ${{ matrix.compilerKind }}
75 HCKIND: ${{ matrix.compilerKind }}
@@ -87,20 +87,20 @@ jobs:
87 echo "HC=$HC" >> "$GITHUB_ENV"
87 echo "HC=$HC" >> "$GITHUB_ENV"
88 echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
88 echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
89 echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
89 echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
90− echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
90+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
91 else
91 else
92 HC=$HCDIR/bin/$HCKIND
92 HC=$HCDIR/bin/$HCKIND
93 echo "HC=$HC" >> "$GITHUB_ENV"
93 echo "HC=$HC" >> "$GITHUB_ENV"
94 echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
94 echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
95 echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
95 echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
96− echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
96+ echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
97 fi
97 fi
98
98
99 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
99 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
100 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
100 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
101 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
101 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
102 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
102 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
103− if [ $((HCNUMVER >= 90200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
103+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
104 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
104 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
105 echo "GHCJSARITH=0" >> "$GITHUB_ENV"
105 echo "GHCJSARITH=0" >> "$GITHUB_ENV"
106 env:
106 env:
@@ -129,17 +129,6 @@ jobs:
129 repository hackage.haskell.org
129 repository hackage.haskell.org
130 url: http://hackage.haskell.org/
130 url: http://hackage.haskell.org/
131 EOF
131 EOF
132− if $HEADHACKAGE; then
133− cat >> $CABAL_CONFIG <<EOF
134− repository head.hackage.ghc.haskell.org
135− url: https://ghc.gitlab.haskell.org/head.hackage/
136− secure: True
137− root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
138− 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
139− f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
140− key-threshold: 3
141− EOF
142− fi
143 cat $CABAL_CONFIG
132 cat $CABAL_CONFIG
144 - name: versions
133 - name: versions
145 run: |
134 run: |
@@ -204,9 +193,6 @@ jobs:
204 package effectful
193 package effectful
205 flags: +benchmark-foreign-libraries
194 flags: +benchmark-foreign-libraries
206 EOF
195 EOF
207− if $HEADHACKAGE; then
208− echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
209− fi
210 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(effectful|effectful-core)$/; }' >> cabal.project.local
196 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(effectful|effectful-core)$/; }' >> cabal.project.local
211 cat cabal.project
197 cat cabal.project
212 cat cabal.project.local
198 cat cabal.project.local
effectful-core/effectful-core.cabal+1−1
@@ -19,7 +19,7 @@ description: An easy to use, performant extensible effects library with seamless
19
19
20extra-source-files: CHANGELOG.md
20extra-source-files: CHANGELOG.md
21
21
22−tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.1 || ==9.2.0.20210821
22+tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.1 || ==9.2.1
23
23
24bug-reports: https://github.com/arybczak/effectful/issues
24bug-reports: https://github.com/arybczak/effectful/issues
25source-repository head
25source-repository head
effectful/effectful.cabal+1−1
@@ -20,7 +20,7 @@ description: An easy to use, performant extensible effects library with seamless
20
20
21extra-source-files: CHANGELOG.md
21extra-source-files: CHANGELOG.md
22
22
23−tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.1 || ==9.2.0.20210821
23+tested-with: GHC ==8.8.4 || ==8.10.7 || ==9.0.1 || ==9.2.1
24
24
25bug-reports: https://github.com/arybczak/effectful/issues
25bug-reports: https://github.com/arybczak/effectful/issues
26source-repository head
26source-repository head