From 59413a0511523241e30b0fd3fe2f5b3bdf8b1d4c Mon Sep 17 00:00:00 2001 From: David Binder Date: Mon, 23 Oct 2023 15:42:34 +0200 Subject: [PATCH] Add Matrix CI (#180) * Add Matrix CI for all supported GHC versions * Add CI for Windows and MacOs * Fix compatibility with GHC 9.6 * Mention compatibility in Changelog --- .github/workflows/ghc-matrix.yml | 76 ++++++++++++++++++++++++++++++++ CHANGELOG | 6 ++- eventlog2html.cabal | 4 +- 3 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/ghc-matrix.yml diff --git a/.github/workflows/ghc-matrix.yml b/.github/workflows/ghc-matrix.yml new file mode 100644 index 0000000..1caf2b2 --- /dev/null +++ b/.github/workflows/ghc-matrix.yml @@ -0,0 +1,76 @@ +name: GHC Matrix CI +on: + push: + branches: + - master + pull_request: + types: + - opened + - synchronize + +jobs: + build: + name: GHC ${{ matrix.ghc-version }} on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + ghc-version: ['9.0.2', '9.2.7', '9.4.7', '9.6.2'] + + include: + - os: windows-latest + ghc-version: '9.6.2' + - os: macos-latest + ghc-version: '9.6.2' + + steps: + - uses: actions/checkout@v4 + + - name: Set up GHC ${{ matrix.ghc-version }} + uses: haskell-actions/setup@v2 + id: setup + with: + ghc-version: ${{ matrix.ghc-version }} + # Defaults, added for clarity: + cabal-version: 'latest' + cabal-update: true + + - name: Configure the build + run: | + cabal configure --enable-tests --enable-benchmarks --disable-documentation + cabal build --dry-run + # The last step generates dist-newstyle/cache/plan.json for the cache key. + + - name: Restore cached dependencies + uses: actions/cache/restore@v3 + id: cache + env: + key: ${{ runner.os }}-ghc-${{ steps.setup.outputs.ghc-version }}-cabal-${{ steps.setup.outputs.cabal-version }} + with: + path: ${{ steps.setup.outputs.cabal-store }} + key: ${{ env.key }}-plan-${{ hashFiles('**/plan.json') }} + restore-keys: ${{ env.key }}- + + - name: Install dependencies + # If we had an exact cache hit, the dependencies will be up to date. + if: steps.cache.outputs.cache-hit != 'true' + run: cabal build all --only-dependencies + + # Cache dependencies already here, so that we do not have to rebuild them should the subsequent steps fail. + - name: Save cached dependencies + uses: actions/cache/save@v3 + # If we had an exact cache hit, trying to save the cache would error because of key clash. + if: steps.cache.outputs.cache-hit != 'true' + with: + path: ${{ steps.setup.outputs.cabal-store }} + key: ${{ steps.cache.outputs.cache-primary-key }} + + - name: Build + run: cabal build all + + - name: Run tests + run: cabal test all + + - name: Check cabal file + run: cabal check diff --git a/CHANGELOG b/CHANGELOG index fb04e32..56b6f48 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +Unreleased + +* Compatibility with 9.0, 9.2, 9.4 and 9.6, which are now also checked in CI. + 0.10.0 release 2023-03-31 * Add support for rendering ticky profiles @@ -6,7 +10,7 @@ * Add "--version" flag for eventlog2html which prints the version, git commit and git branch used to build eventlog2html. -* Compatability with 9.4.* and 9.2.* compilers. +* Compatibility with 9.4.* and 9.2.* compilers. 0.9.2 release 2021-11-24 diff --git a/eventlog2html.cabal b/eventlog2html.cabal index 384033e..51cc804 100644 --- a/eventlog2html.cabal +++ b/eventlog2html.cabal @@ -30,7 +30,7 @@ Extra-source-files: javascript/generated/vega-lite@4.17.0 extra-doc-files: README.md CHANGELOG -Tested-With: GHC ==9.2.5, GHC ==9.4.3 +Tested-With: GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.7, GHC ==9.6.2 Library Build-depends: @@ -47,7 +47,7 @@ Library ghc-events >= 0.19.0 && < 0.20, hashtables >= 1.2.3 && < 1.4, hvega >= 0.11.0 && < 0.13, - mtl >= 2.2.2 && < 2.3, + mtl >= 2.2.2 && < 2.4, optparse-applicative >= 0.14.3 && < 0.18, semigroups >= 0.18 && < 0.21, text >= 1.2.3 && < 1.3 || >= 2.0 && < 2.1,