From 3e4fe974a3c7f5a0fe60987823f4b8ebba550a36 Mon Sep 17 00:00:00 2001 From: chessai Date: Mon, 12 Apr 2021 18:30:14 -0700 Subject: [PATCH] update ci (#594) Summary: - Update GHC 8.10.2 to 8.10.3 - Add GHC 9.0.1 - Make stack CI as extensive as cabal CI - update tested-with - remove cabal CI, keep stack only Pull Request resolved: https://github.com/facebook/duckling/pull/594 Reviewed By: girifb Differential Revision: D27710921 Pulled By: chessai fbshipit-source-id: 098bcbb33c7dc7dfac4e2e46ca9ea07083b47b59 --- .github/workflows/ci.yml | 49 ++++------------------------------------ duckling.cabal | 4 +++- 2 files changed, 7 insertions(+), 46 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 915f2446..e682baa3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,67 +7,26 @@ on: branches: [master] jobs: - cabal: + stack: name: ${{ matrix.os }} / ghc ${{ matrix.ghc }} runs-on: ${{ matrix.os }} strategy: matrix: os: [ubuntu-latest, macOS-latest, windows-latest] - cabal: ["3.2"] - ghc: - - "8.6.5" - - "8.8.4" - - "8.10.2" - - steps: - - uses: actions/checkout@v2 - if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' - - - uses: actions/setup-haskell@v1.1.4 - id: setup-haskell-cabal - name: Setup Haskell - with: - ghc-version: ${{ matrix.ghc }} - cabal-version: ${{ matrix.cabal }} - - - name: Freeze - run: | - cabal freeze - - - uses: actions/cache@v1 - name: Cache ~/.cabal/store - with: - path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }} - key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }} - - - name: Build - run: | - cabal configure --enable-tests --enable-benchmarks --test-show-details=direct - cabal build lib:duckling test:duckling-test - - - name: Test - run: | - cabal test all - - stack: - name: stack / ghc ${{ matrix.ghc }} - runs-on: ubuntu-latest - strategy: - matrix: stack: ["2.5.1"] - ghc: ["8.8.4"] + ghc: ["8.6.5", "8.8.4", "8.10.3", "9.0.1"] steps: - uses: actions/checkout@v2 if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' - - uses: actions/setup-haskell@v1.1.4 + - uses: haskell/actions/setup@v1 name: Setup Haskell Stack with: ghc-version: ${{ matrix.ghc }} stack-version: ${{ matrix.stack }} - - uses: actions/cache@v1 + - uses: actions/cache@v2.1.4 name: Cache ~/.stack with: path: ~/.stack diff --git a/duckling.cabal b/duckling.cabal index bac9adb8..62d26576 100644 --- a/duckling.cabal +++ b/duckling.cabal @@ -23,7 +23,9 @@ stability: alpha tested-with: GHC==8.4.4, GHC==8.6.5, - GHC==8.8.3 + GHC==8.8.4, + GHC==8.10.3, + GHC==9.0.1 extra-source-files: README.md