Skip to content

Commit

Permalink
[#25] Support GHC-9.0 (#26)
Browse files Browse the repository at this point in the history
* [#25] Support GHC-9.0

Resolves #25

* Use newer stack lts
  • Loading branch information
vrom911 authored Mar 23, 2021
1 parent 024d8fa commit d77b9d8
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 20 deletions.
53 changes: 38 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
name: CI

# Trigger the workflow on push or pull request, but only for the main branch
on:
pull_request:
types: [synchronize, opened, reopened]
push:
branches: [main]
schedule:
# additionally run once per week (At 00:00 on Sunday) to maintain cache
- cron: '0 0 * * 0'

jobs:
cabal:
Expand All @@ -13,14 +16,17 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest]
cabal: ["3.0"]
cabal: ["3.4"]
ghc:
- "8.2.2"
- "8.4.4"
- "8.6.5"
- "8.8.4"
- "8.10.2"
- "8.10.4"
- "9.0.1"
exclude:
- os: macOS-latest
ghc: 9.0.1
- os: macOS-latest
ghc: 8.8.4
- os: macOS-latest
Expand All @@ -32,43 +38,56 @@ jobs:

steps:
- uses: actions/checkout@v2
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'

- uses: actions/setup-haskell@v1.1
- uses: haskell/actions/setup@v1
id: setup-haskell-cabal
name: Setup Haskell
with:
ghc-version: ${{ matrix.ghc }}
cabal-version: ${{ matrix.cabal }}

- uses: actions/cache@v1
name: Cache cabal-store
- name: Configure
run: |
cabal configure --enable-tests --enable-benchmarks --enable-documentation --test-show-details=direct --write-ghc-environment-files=always
- name: Freeze
run: |
cabal freeze
- uses: actions/[email protected]
name: Cache ~/.cabal/store
with:
path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
key: ${{ runner.os }}-${{ matrix.ghc }}-cabal
key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}

- name: Install dependencies
run: |
cabal build all --only-dependencies
- name: Build
run: |
cabal update
cabal build all --enable-tests --enable-benchmarks --write-ghc-environment-files=always
cabal build all
- name: Test
run: |
cabal test --enable-tests
cabal test all
- name: Documentation
run: |
cabal haddock
stack:
name: stack / ghc ${{ matrix.ghc }}
runs-on: ubuntu-latest
strategy:
matrix:
stack: ["2.1.3"]
ghc: ["8.10.2"]
stack: ["2.5"]
ghc: ["8.10.4"]

steps:
- uses: actions/checkout@v2
if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'

- uses: actions/setup-haskell@v1.1
- uses: haskell/actions/setup@v1
name: Setup Haskell Stack
with:
ghc-version: ${{ matrix.ghc }}
Expand All @@ -80,6 +99,10 @@ jobs:
path: ~/.stack
key: ${{ runner.os }}-${{ matrix.ghc }}-stack

- name: Install dependencies
run: |
stack build --system-ghc --test --bench --no-run-tests --no-run-benchmarks --only-dependencies
- name: Build
run: |
stack build --system-ghc --test --bench --no-run-tests --no-run-benchmarks
Expand Down
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ The changelog is available [on GitHub][2].

* [#20](https://github.com/kowainik/shellmet/issues/20):
Add `isSuccess` function to show if the command succeded.
* Upgrade GHC from `8.8.3` to `8.8.4`, `8.10.1` to `8.10.2`.
* [#25](https://github.com/kowainik/shellmet/issues/25):
Support GHC-9.0.
* Upgrade GHC from `8.8.3` to `8.8.4`, `8.10.1` to `8.10.4`.

## 0.0.3.1 — May 7, 2020

Expand Down
7 changes: 4 additions & 3 deletions shellmet.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: shellmet
version: 0.0.3.1
version: 0.0.4.0
synopsis: Out of the shell solution for scripting in Haskell
description: Shellmet provides easy and convenient way to call shell commands from Haskell programs
homepage: https://github.com/kowainik/shellmet
Expand All @@ -18,14 +18,15 @@ tested-with: GHC == 8.2.2
GHC == 8.4.4
GHC == 8.6.5
GHC == 8.8.4
GHC == 8.10.2
GHC == 8.10.4
GHC == 9.0.1

source-repository head
type: git
location: https://github.com/kowainik/shellmet.git

common common-options
build-depends: base >= 4.10.1.0 && < 4.15
build-depends: base >= 4.10.1.0 && < 4.16

ghc-options: -Wall
-Wcompat
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
resolver: nightly-2020-08-30
resolver: lts-17.7

0 comments on commit d77b9d8

Please sign in to comment.