Skip to content

Commit 4db00f1

Browse files
phadejphadej
committed
haskell-ci-0.12, update CONTRIBUTING
1 parent d1f6339 commit 4db00f1

File tree

2 files changed

+27
-25
lines changed

2 files changed

+27
-25
lines changed

‎.github/workflows/haskell-ci.yml

+26-24
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.20210220
11+
# version: 0.12
1212
#
13-
# REGENDATA ("0.11.20210220",["github","--config=cabal.haskell-ci","lattices.cabal"])
13+
# REGENDATA ("0.12",["github","--config=cabal.haskell-ci","lattices.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -22,33 +22,33 @@ 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
3434
allow-failure: false
35-
- ghc: 8.10.4
35+
- compiler: ghc-8.10.4
3636
allow-failure: false
37-
- ghc: 8.8.3
37+
- compiler: ghc-8.8.3
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
5353
fail-fast: false
5454
steps:
@@ -58,29 +58,31 @@ jobs:
5858
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common
5959
apt-add-repository -y 'ppa:hvr/ghc'
6060
apt-get update
61-
apt-get install -y ghc-$GHC_VERSION cabal-install-3.2
61+
apt-get install -y $CC cabal-install-3.4
6262
env:
63-
GHC_VERSION: ${{ matrix.ghc }}
63+
CC: ${{ matrix.compiler }}
6464
- name: Set PATH and environment variables
6565
run: |
6666
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
6767
echo "LANG=C.UTF-8" >> $GITHUB_ENV
6868
echo "CABAL_DIR=$HOME/.cabal" >> $GITHUB_ENV
6969
echo "CABAL_CONFIG=$HOME/.cabal/config" >> $GITHUB_ENV
70-
HC=/opt/ghc/$GHC_VERSION/bin/ghc
70+
HCDIR=$(echo "/opt/$CC" | sed 's/-/\//')
71+
HCNAME=ghc
72+
HC=$HCDIR/bin/$HCNAME
7173
echo "HC=$HC" >> $GITHUB_ENV
72-
echo "HCPKG=/opt/ghc/$GHC_VERSION/bin/ghc-pkg" >> $GITHUB_ENV
73-
echo "HADDOCK=/opt/ghc/$GHC_VERSION/bin/haddock" >> $GITHUB_ENV
74-
echo "CABAL=/opt/cabal/3.2/bin/cabal -vnormal+nowrap" >> $GITHUB_ENV
74+
echo "HCPKG=$HCDIR/bin/$HCNAME-pkg" >> $GITHUB_ENV
75+
echo "HADDOCK=$HCDIR/bin/haddock" >> $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=--$HCNAME --with-compiler=$HC" >> $GITHUB_ENV
8183
echo "GHCJSARITH=0" >> $GITHUB_ENV
8284
env:
83-
GHC_VERSION: ${{ matrix.ghc }}
85+
CC: ${{ matrix.compiler }}
8486
- name: env
8587
run: |
8688
env
@@ -115,7 +117,7 @@ jobs:
115117
- name: cache (tools)
116118
uses: actions/cache@v2
117119
with:
118-
key: ${{ runner.os }}-${{ matrix.ghc }}-tools-7e5c568c
120+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-7e5c568c
119121
path: ~/.haskell-ci-tools
120122
- name: install cabal-plan
121123
run: |
@@ -177,9 +179,9 @@ jobs:
177179
- name: cache
178180
uses: actions/cache@v2
179181
with:
180-
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}
182+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
181183
path: ~/.cabal/store
182-
restore-keys: ${{ runner.os }}-${{ matrix.ghc }}-
184+
restore-keys: ${{ runner.os }}-${{ matrix.compiler }}-
183185
- name: install dependencies
184186
run: |
185187
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Patches welcome!
44
- If it's really **only bounds**, please simply open an issue (so you'll have a URL to refer to). I have a semi-automated process to make revisions, pull requests only disturb it.
55
- If patch includes **source code change** (i.e. I'll need to make a release), and it's a patch to support **newer base/GHC version**:
66
- Amend `tested-with` to include that GHC
7-
- Regenerate `.travis.yml` with `haskell-ci regenerate` (get the latest from [GitHub haskell-ci/haskell-ci](https://github.com/haskell-ci/haskell-ci))
7+
- Regenerate `.github/workflows/haskell-ci.yml` with `haskell-ci regenerate` (get the latest from [GitHub haskell-ci/haskell-ci](https://github.com/haskell-ci/haskell-ci))
88

99
- Don't edit `CHANGELOG.md`, rather include a copyable entry in your pull request description. I often process pull requests in bulk, and everyone editing the `CHANGELOG.md` causes unnecessary conflicts.
1010
- For the same reason, do not edit `version` or `x-revision`

0 commit comments

Comments
 (0)