Skip to content

Commit e802007

Browse files
authored
Merge pull request #10 from phadej/ghc-9.0-job
Add GHC-9.0 GHA job, remove .travis file
2 parents de98e67 + 956854a commit e802007

File tree

3 files changed

+10
-170
lines changed

3 files changed

+10
-170
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 8 additions & 6 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.20210214
11+
# version: 0.11.20210220
1212
#
13-
# REGENDATA ("0.11.20210214",["github","regex-posix.cabal"])
13+
# REGENDATA ("0.11.20210220",["github","regex-posix.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -26,7 +26,9 @@ jobs:
2626
strategy:
2727
matrix:
2828
include:
29-
- ghc: 8.10.3
29+
- ghc: 9.0.1
30+
allow-failure: false
31+
- ghc: 8.10.4
3032
allow-failure: false
3133
- ghc: 8.8.4
3234
allow-failure: false
@@ -58,7 +60,7 @@ jobs:
5860
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
5961
apt-add-repository -y 'ppa:hvr/ghc'
6062
apt-get update
61-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
63+
apt-get install -y ghc-$GHC_VERSION cabal-install-3.4
6264
env:
6365
GHC_VERSION: ${{ matrix.ghc }}
6466
- name: Set PATH and environment variables
@@ -71,13 +73,13 @@ jobs:
7173
echo "HC=$HC" >> $GITHUB_ENV
7274
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
7375
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
74-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
76+
echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
7577
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
7678
echo "HCNUMVER=$HCNUMVER" >> $GITHUB_ENV
7779
echo "ARG_TESTS=--enable-tests" >> $GITHUB_ENV
7880
echo "ARG_BENCH=--enable-benchmarks" >> $GITHUB_ENV
7981
echo "HEADHACKAGE=false" >> $GITHUB_ENV
80-
echo "ARG_COMPILER=--ghc --with-compiler=/opt/ghc/$GHC_VERSION/bin/ghc" >> $GITHUB_ENV
82+
echo "ARG_COMPILER=--ghc --with-compiler=$HC" >> $GITHUB_ENV
8183
echo "GHCJSARITH=0" >> $GITHUB_ENV
8284
env:
8385
GHC_VERSION: ${{ matrix.ghc }}

.travis.yml

Lines changed: 0 additions & 160 deletions
This file was deleted.

regex-posix.cabal

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ tested-with:
3636
GHC == 8.4.4
3737
GHC == 8.6.5
3838
GHC == 8.8.4
39-
GHC == 8.10.3
40-
-- manually (AA, 2021-02-17):
41-
-- GHC == 8.10.4
42-
-- GHC == 9.0.1
39+
GHC == 8.10.4
40+
GHC == 9.0.1
4341

4442
source-repository head
4543
type: git

0 commit comments

Comments
 (0)