Skip to content

Commit e344098

Browse files
phadejphadej
committed
Drop GHC-7 support
1 parent 0dd6f2c commit e344098

File tree

17 files changed

+164
-255
lines changed

17 files changed

+164
-255
lines changed

‎.github/workflows/haskell-ci.yml

Lines changed: 62 additions & 38 deletions
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.11.20210222
11+
# version: 0.13.20210827
1212
#
13-
# REGENDATA ("0.11.20210222",["github","cabal.project"])
13+
# REGENDATA ("0.13.20210827",["github","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -22,63 +22,85 @@ 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:
2828
image: buildpack-deps:bionic
2929
continue-on-error: ${{ matrix.allow-failure }}
3030
strategy:
3131
matrix:
3232
include:
33-
- ghc: 9.0.1
33+
- compiler: ghc-9.0.1
34+
compilerKind: ghc
35+
compilerVersion: 9.0.1
36+
setup-method: hvr-ppa
3437
allow-failure: false
35-
- ghc: 8.10.4
38+
- compiler: ghc-8.10.4
39+
compilerKind: ghc
40+
compilerVersion: 8.10.4
41+
setup-method: hvr-ppa
3642
allow-failure: false
37-
- ghc: 8.8.4
43+
- compiler: ghc-8.8.4
44+
compilerKind: ghc
45+
compilerVersion: 8.8.4
46+
setup-method: hvr-ppa
3847
allow-failure: false
39-
- ghc: 8.6.5
48+
- compiler: ghc-8.6.5
49+
compilerKind: ghc
50+
compilerVersion: 8.6.5
51+
setup-method: hvr-ppa
4052
allow-failure: false
41-
- ghc: 8.4.4
53+
- compiler: ghc-8.4.4
54+
compilerKind: ghc
55+
compilerVersion: 8.4.4
56+
setup-method: hvr-ppa
4257
allow-failure: false
43-
- ghc: 8.2.2
58+
- compiler: ghc-8.2.2
59+
compilerKind: ghc
60+
compilerVersion: 8.2.2
61+
setup-method: hvr-ppa
4462
allow-failure: false
45-
- ghc: 8.0.2
46-
allow-failure: false
47-
- ghc: 7.10.3
48-
allow-failure: false
49-
- ghc: 7.8.4
63+
- compiler: ghc-8.0.2
64+
compilerKind: ghc
65+
compilerVersion: 8.0.2
66+
setup-method: hvr-ppa
5067
allow-failure: false
5168
fail-fast: false
5269
steps:
5370
- name: apt
5471
run: |
5572
apt-get update
56-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
73+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
5774
apt-add-repository -y 'ppa:hvr/ghc'
5875
apt-get update
59-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
76+
apt-get install -y "$HCNAME" cabal-install-3.4
6077
env:
61-
GHC_VERSION: ${{ matrix.ghc }}
78+
HCKIND: ${{ matrix.compilerKind }}
79+
HCNAME: ${{ matrix.compiler }}
80+
HCVER: ${{ matrix.compilerVersion }}
6281
- name: Set PATH and environment variables
6382
run: |
6483
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
65-
echo "LANG=C.UTF-8" >> $GITHUB_ENV
66-
echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV
67-
echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV
68-
HC=/opt/ghc/$GHC_VERSION/bin/ghc
69-
echo "HC=$HC" >> $GITHUB_ENV
70-
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
71-
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
72-
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
84+
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
85+
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
86+
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
87+
HCDIR=/opt/$HCKIND/$HCVER
88+
HC=$HCDIR/bin/$HCKIND
89+
echo "HC=$HC" >> "$GITHUB_ENV"
90+
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
91+
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
92+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> "$GITHUB_ENV"
7393
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
74-
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
75-
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
76-
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
77-
echo "HEADHACKAGE=false" >> $GITHUB_ENV
78-
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
79-
echo "GHCJSARITH=0" >> $GITHUB_ENV
94+
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
95+
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
96+
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
97+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
98+
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
99+
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
80100
env:
81-
GHC_VERSION: ${{ matrix.ghc }}
101+
HCKIND: ${{ matrix.compilerKind }}
102+
HCNAME: ${{ matrix.compiler }}
103+
HCVER: ${{ matrix.compilerVersion }}
82104
- name: env
83105
run: |
84106
env
@@ -113,7 +135,7 @@ jobs:
113135
- name: cache (tools)
114136
uses: actions/cache@v2
115137
with:
116-
key: ${{ runner.os }}-${{ matrix.ghc }}-tools-6e0baf7c
138+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-f55e2677
117139
path: ~/.haskell-ci-tools
118140
- name: install cabal-plan
119141
run: |
@@ -146,11 +168,12 @@ jobs:
146168
- name: generate cabal.project
147169
run: |
148170
PKGDIR_aeson="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/aeson-[0-9.]*')"
149-
echo "PKGDIR_aeson=${PKGDIR_aeson}" >> $GITHUB_ENV
171+
echo "PKGDIR_aeson=${PKGDIR_aeson}" >> "$GITHUB_ENV"
150172
PKGDIR_attoparsec_iso8601="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/attoparsec-iso8601-[0-9.]*')"
151-
echo "PKGDIR_attoparsec_iso8601=${PKGDIR_attoparsec_iso8601}" >> $GITHUB_ENV
173+
echo "PKGDIR_attoparsec_iso8601=${PKGDIR_attoparsec_iso8601}" >> "$GITHUB_ENV"
152174
PKGDIR_aeson_examples="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/aeson-examples-[0-9.]*')"
153-
echo "PKGDIR_aeson_examples=${PKGDIR_aeson_examples}" >> $GITHUB_ENV
175+
echo "PKGDIR_aeson_examples=${PKGDIR_aeson_examples}" >> "$GITHUB_ENV"
176+
rm -f cabal.project cabal.project.local
154177
touch cabal.project
155178
touch cabal.project.local
156179
echo "packages: ${PKGDIR_aeson}" >> cabal.project
@@ -174,9 +197,9 @@ jobs:
174197
- name: cache
175198
uses: actions/cache@v2
176199
with:
177-
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
200+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
178201
path: ~/.cabal/store
179-
restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
202+
restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
180203
- name: install dependencies
181204
run: |
182205
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all
@@ -202,5 +225,6 @@ jobs:
202225
rm -f cabal.project.local
203226
- name: constraint set cffi
204227
run: |
228+
$CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='aeson +cffi' --dependencies-only -j2 all
205229
$CABAL v2-build $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='aeson +cffi' all
206230
$CABAL v2-test $ARG_COMPILER --enable-tests --disable-benchmarks --constraint='aeson +cffi' all

‎.github/workflows/z-bench.yml

Lines changed: 58 additions & 35 deletions
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.11.20210222
11+
# version: 0.13.20210827
1212
#
13-
# REGENDATA ("0.11.20210222",["github","-o",".github/workflows/z-bench.yml","--config=cabal.bench.haskell-ci","--project","cabal.bench.project"])
13+
# REGENDATA ("0.13.20210827",["github","-o",".github/workflows/z-bench.yml","--config=cabal.bench.haskell-ci","--project","cabal.bench.project"])
1414
#
1515
name: Z Bench CI
1616
on:
@@ -22,63 +22,85 @@ on:
2222
- master
2323
jobs:
2424
linux:
25-
name: Z Bench CI - Linux - GHC ${{ matrix.ghc }}
25+
name: Z Bench CI - Linux - ${{ matrix.compiler }}
2626
runs-on: ubuntu-18.04
2727
container:
2828
image: buildpack-deps:bionic
2929
continue-on-error: ${{ matrix.allow-failure }}
3030
strategy:
3131
matrix:
3232
include:
33-
- ghc: 9.0.1
33+
- compiler: ghc-9.0.1
34+
compilerKind: ghc
35+
compilerVersion: 9.0.1
36+
setup-method: hvr-ppa
3437
allow-failure: false
35-
- ghc: 8.10.4
38+
- compiler: ghc-8.10.4
39+
compilerKind: ghc
40+
compilerVersion: 8.10.4
41+
setup-method: hvr-ppa
3642
allow-failure: false
37-
- ghc: 8.8.4
43+
- compiler: ghc-8.8.4
44+
compilerKind: ghc
45+
compilerVersion: 8.8.4
46+
setup-method: hvr-ppa
3847
allow-failure: false
39-
- ghc: 8.6.5
48+
- compiler: ghc-8.6.5
49+
compilerKind: ghc
50+
compilerVersion: 8.6.5
51+
setup-method: hvr-ppa
4052
allow-failure: false
41-
- ghc: 8.4.4
53+
- compiler: ghc-8.4.4
54+
compilerKind: ghc
55+
compilerVersion: 8.4.4
56+
setup-method: hvr-ppa
4257
allow-failure: false
43-
- ghc: 8.2.2
58+
- compiler: ghc-8.2.2
59+
compilerKind: ghc
60+
compilerVersion: 8.2.2
61+
setup-method: hvr-ppa
4462
allow-failure: false
45-
- ghc: 8.0.2
46-
allow-failure: false
47-
- ghc: 7.10.3
48-
allow-failure: false
49-
- ghc: 7.8.4
63+
- compiler: ghc-8.0.2
64+
compilerKind: ghc
65+
compilerVersion: 8.0.2
66+
setup-method: hvr-ppa
5067
allow-failure: false
5168
fail-fast: false
5269
steps:
5370
- name: apt
5471
run: |
5572
apt-get update
56-
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
73+
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
5774
apt-add-repository -y 'ppa:hvr/ghc'
5875
apt-get update
59-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
76+
apt-get install -y "$HCNAME" cabal-install-3.4
6077
env:
61-
GHC_VERSION: ${{ matrix.ghc }}
78+
HCKIND: ${{ matrix.compilerKind }}
79+
HCNAME: ${{ matrix.compiler }}
80+
HCVER: ${{ matrix.compilerVersion }}
6281
- name: Set PATH and environment variables
6382
run: |
6483
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
65-
echo "LANG=C.UTF-8" >> $GITHUB_ENV
66-
echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV
67-
echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV
68-
HC=/opt/ghc/$GHC_VERSION/bin/ghc
69-
echo "HC=$HC" >> $GITHUB_ENV
70-
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
71-
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
72-
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
84+
echo "LANG=C.UTF-8" >> "$GITHUB_ENV"
85+
echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
86+
echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
87+
HCDIR=/opt/$HCKIND/$HCVER
88+
HC=$HCDIR/bin/$HCKIND
89+
echo "HC=$HC" >> "$GITHUB_ENV"
90+
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
91+
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
92+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> "$GITHUB_ENV"
7393
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
74-
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
75-
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
76-
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
77-
echo "HEADHACKAGE=false" >> $GITHUB_ENV
78-
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
79-
echo "GHCJSARITH=0" >> $GITHUB_ENV
94+
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
95+
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
96+
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
97+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
98+
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
99+
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
80100
env:
81-
GHC_VERSION: ${{ matrix.ghc }}
101+
HCKIND: ${{ matrix.compilerKind }}
102+
HCNAME: ${{ matrix.compiler }}
103+
HCVER: ${{ matrix.compilerVersion }}
82104
- name: env
83105
run: |
84106
env
@@ -139,7 +161,8 @@ jobs:
139161
- name: generate cabal.project
140162
run: |
141163
PKGDIR_aeson_benchmarks="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/aeson-benchmarks-[0-9.]*')"
142-
echo "PKGDIR_aeson_benchmarks=${PKGDIR_aeson_benchmarks}" >> $GITHUB_ENV
164+
echo "PKGDIR_aeson_benchmarks=${PKGDIR_aeson_benchmarks}" >> "$GITHUB_ENV"
165+
rm -f cabal.project cabal.project.local
143166
touch cabal.project
144167
touch cabal.project.local
145168
echo "packages: ${PKGDIR_aeson_benchmarks}" >> cabal.project
@@ -157,9 +180,9 @@ jobs:
157180
- name: cache
158181
uses: actions/cache@v2
159182
with:
160-
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
183+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
161184
path: ~/.cabal/store
162-
restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
185+
restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
163186
- name: install dependencies
164187
run: |
165188
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all

0 commit comments

Comments
 (0)