Skip to content

Commit 3ab1901

Browse files
committed
Regenerate CI config
1 parent e3c4664 commit 3ab1901

File tree

1 file changed

+30
-28
lines changed

1 file changed

+30
-28
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 30 additions & 28 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' 'cabal.project' '--doctest'
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.11.20210222
11+
# version: 0.13.20210525
1212
#
13-
# REGENDATA ("0.11.20210222",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.13.20210525",["github","--config=cabal.haskell-ci","cabal.project","--doctest"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -22,39 +22,39 @@ on:
2222
- master
2323
jobs:
2424
linux:
25-
name: Haskell-CI - Linux - GHC ${{ matrix.ghc }}
25+
name: Haskell-CI - Linux - ${{ matrix.compiler }}
2626
runs-on: ubuntu-18.04
2727
container:
28-
image: buildpack-deps:bionic
28+
image: buildpack-deps:xenial
2929
continue-on-error: ${{ matrix.allow-failure }}
3030
strategy:
3131
matrix:
3232
include:
33-
- ghc: 9.0.1
33+
- compiler: ghc-9.0.1
3434
allow-failure: false
35-
- ghc: 8.10.4
35+
- compiler: ghc-8.10.4
3636
allow-failure: false
37-
- ghc: 8.8.4
37+
- compiler: ghc-8.8.4
3838
allow-failure: false
39-
- ghc: 8.6.5
39+
- compiler: ghc-8.6.5
4040
allow-failure: false
41-
- ghc: 8.4.4
41+
- compiler: ghc-8.4.4
4242
allow-failure: false
43-
- ghc: 8.2.2
43+
- compiler: ghc-8.2.2
4444
allow-failure: false
45-
- ghc: 8.0.2
45+
- compiler: ghc-8.0.2
4646
allow-failure: false
47-
- ghc: 7.10.3
47+
- compiler: ghc-7.10.3
4848
allow-failure: false
49-
- ghc: 7.8.4
49+
- compiler: ghc-7.8.4
5050
allow-failure: false
51-
- ghc: 7.6.3
51+
- compiler: ghc-7.6.3
5252
allow-failure: false
53-
- ghc: 7.4.2
53+
- compiler: ghc-7.4.2
5454
allow-failure: false
55-
- ghc: 7.2.2
55+
- compiler: ghc-7.2.2
5656
allow-failure: false
57-
- ghc: 7.0.4
57+
- compiler: ghc-7.0.4
5858
allow-failure: false
5959
fail-fast: false
6060
steps:
@@ -64,29 +64,31 @@ jobs:
6464
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
6565
apt-add-repository -y 'ppa:hvr/ghc'
6666
apt-get update
67-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
67+
apt-get install -y $CC cabal-install-3.4
6868
env:
69-
GHC_VERSION: ${{ matrix.ghc }}
69+
CC: ${{ matrix.compiler }}
7070
- name: Set PATH and environment variables
7171
run: |
7272
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
7373
echo "LANG=C.UTF-8" >> $GITHUB_ENV
7474
echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV
7575
echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV
76-
HC=/opt/ghc/$GHC_VERSION/bin/ghc
76+
HCDIR=$(echo "/opt/$CC" | sed 's/-/\//')
77+
HCNAME=ghc
78+
HC=$HCDIR/bin/$HCNAME
7779
echo "HC=$HC" >> $GITHUB_ENV
78-
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
79-
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
80+
echo "HCPKG=$HCDIR/bin/$HCNAME-pkg" >> $GITHUB_ENV
81+
echo "HADDOCK=$HCDIR/bin/haddock" >> $GITHUB_ENV
8082
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
8183
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
8284
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
8385
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
8486
if [ $((HCNUMVER >= 70600)) -ne 0 ] ; then echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV ; else echo "ARG_BENCH=--disable-benchmarks" >> $GITHUB_ENV ; fi
8587
echo "HEADHACKAGE=false" >> $GITHUB_ENV
86-
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
88+
echo "ARG_COMPILER=--$HCNAME --with-compiler=$HC" >> $GITHUB_ENV
8789
echo "GHCJSARITH=0" >> $GITHUB_ENV
8890
env:
89-
GHC_VERSION: ${{ matrix.ghc }}
91+
CC: ${{ matrix.compiler }}
9092
- name: env
9193
run: |
9294
env
@@ -121,7 +123,7 @@ jobs:
121123
- name: cache (tools)
122124
uses: actions/[email protected]
123125
with:
124-
key: ${{ runner.os }}-${{ matrix.ghc }}-tools-2f29a7e3
126+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-8139d618
125127
path: ~/.haskell-ci-tools
126128
- name: install cabal-plan
127129
run: |
@@ -175,9 +177,9 @@ jobs:
175177
- name: cache
176178
uses: actions/[email protected]
177179
with:
178-
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
180+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
179181
path: ~/.cabal/store
180-
restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
182+
restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
181183
- name: build w/o tests
182184
run: |
183185
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all

0 commit comments

Comments
 (0)