From da79aea71b9cc7ee6e56792b4716be0ff11a09fb Mon Sep 17 00:00:00 2001 From: Hécate Moonlight Date: Fri, 28 May 2021 12:27:35 +0200 Subject: Use GHC 9.2 in CI runner (#1378) --- .github/workflows/ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to '.github/workflows/ci.yml') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2b882e3..4baa2fc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ name: CI on: pull_request: push: - branches: ["ghc-9.0"] + branches: ["ghc-9.2"] jobs: cabal: @@ -15,11 +15,11 @@ jobs: os: [ubuntu-latest] cabal: ["3.4"] ghc: - - "9.0.1" + - "9.2.0.20210422" steps: - uses: actions/checkout@v2 - if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/ghc-9.0' + if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/ghc-9.2' - uses: haskell/actions/setup@v1 id: setup-haskell-cabal @@ -37,12 +37,11 @@ jobs: cabal freeze - uses: actions/cache@v2 - name: Cache ~/.cabal/store and .ghcup + name: Cache ~/.cabal/store with: path: | ${{ steps.setup-haskell-cabal.outputs.cabal-store }} - .ghcup - key: ${{ runner.os }} + key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }} - name: Build run: | -- cgit v1.2.3 From f76f3e91d1e62f4df3a2735b8dd2b7ddfacb6e8f Mon Sep 17 00:00:00 2001 From: Hécate Moonlight Date: Thu, 7 Oct 2021 23:25:39 +0200 Subject: Update GHC 9.2 to latest pre-release in CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/ci.yml') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4baa2fc5..83677352 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: os: [ubuntu-latest] cabal: ["3.4"] ghc: - - "9.2.0.20210422" + - "9.2.0.20210821" steps: - uses: actions/checkout@v2 -- cgit v1.2.3 From 0000202ce6e5a169877181efe8da0555fac109a3 Mon Sep 17 00:00:00 2001 From: Artem Pelenitsyn Date: Sat, 27 Nov 2021 05:14:17 -0500 Subject: fix CI for 9.2 (#1436) --- .github/workflows/ci.yml | 4 ++-- cabal.project | 16 ++++++++-------- haddock-api/haddock-api.cabal | 4 ++-- haddock-api/src/Haddock/Backends/Hyperlinker.hs | 1 - haddock-library/haddock-library.cabal | 4 ++-- 5 files changed, 14 insertions(+), 15 deletions(-) (limited to '.github/workflows/ci.yml') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 83677352..9268c6b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,9 +13,9 @@ jobs: strategy: matrix: os: [ubuntu-latest] - cabal: ["3.4"] + cabal: ["3.6"] ghc: - - "9.2.0.20210821" + - "9.2.1" steps: - uses: actions/checkout@v2 diff --git a/cabal.project b/cabal.project index bac38a52..593a1eaf 100644 --- a/cabal.project +++ b/cabal.project @@ -44,7 +44,7 @@ constraints: alex ==3.2.6, ansi-pretty ==0.1.2.2, arith-encode ==1.0.2, - attoparsec ==0.13.2.5 || ==0.14.1, + attoparsec ==0.13.2.5 || ==0.14.2, barbies ==2.0.2.0, barbies-th ==0.1.8, base-compat ==0.11.2, @@ -64,7 +64,7 @@ constraints: cassava ==0.5.2.0, cborg ==0.2.5.0, cereal ==0.5.8.1, - charset ==0.3.8, + charset ==0.3.9, chaselev-deque ==0.5.0.5, colour ==2.3.5, combinat ==0.2.10.0, @@ -106,7 +106,7 @@ constraints: heterocephalus ==1.0.5.4, hgeometry ==0.11.0.0, hgeometry-ipe ==0.11.0.0, - hspec-discover ==2.8.2, + hspec-discover ==2.9.1, hspec-expectations ==0.8.2, hspec-meta ==2.7.8, hspec-wai ==0.11.1, @@ -141,19 +141,19 @@ constraints: plots ==0.1.1.2, pointed ==5.0.2, posix-api ==0.3.4.0, - primitive ==0.7.1.0, + primitive ==0.7.3.0, primitive-extras ==0.10.1, primitive-sort ==0.1.0.0, primitive-unlifted ==0.1.3.0, proto3-wire ==1.2.2, quickcheck-instances ==0.3.25.2, - random ==1.2.0, + random ==1.2.1, row-types ==1.0.1.0, safe ==0.3.19, safecopy ==0.10.4.2, salak ==0.3.6, - semialign ==1.2, - semigroupoids ==5.3.5, + semialign ==1.2.0.1, + semigroupoids ==5.3.6, serialise ==0.2.3.0, servant ==0.18.2, shake ==0.19.4, @@ -172,7 +172,7 @@ constraints: th-desugar ==1.11 || ==1.12, tls ==1.5.5, tpdb ==2.2.0, - tree-diff ==0.2, + tree-diff ==0.2.1, true-name ==0.1.0.3, uniplate ==1.6.13, vector-builder ==0.3.8.1, diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal index 6258613e..01165582 100644 --- a/haddock-api/haddock-api.cabal +++ b/haddock-api/haddock-api.cabal @@ -184,7 +184,7 @@ test-suite spec , ghc-paths ^>= 0.1.0.12 , haddock-library ^>= 1.9.0 , xhtml ^>= 3000.2.2 - , hspec ^>= 2.8 + , hspec ^>= 2.9 , parsec ^>= 3.1.13.0 , QuickCheck >= 2.11 && ^>= 2.14 @@ -205,7 +205,7 @@ test-suite spec , transformers build-tool-depends: - hspec-discover:hspec-discover ^>= 2.8 + hspec-discover:hspec-discover ^>= 2.9 source-repository head type: git diff --git a/haddock-api/src/Haddock/Backends/Hyperlinker.hs b/haddock-api/src/Haddock/Backends/Hyperlinker.hs index d16aa24e..5bbea77b 100644 --- a/haddock-api/src/Haddock/Backends/Hyperlinker.hs +++ b/haddock-api/src/Haddock/Backends/Hyperlinker.hs @@ -107,4 +107,3 @@ highlightScript = "highlight.js" -- | Path to default CSS file. defaultCssFile :: FilePath -> FilePath defaultCssFile libdir = libdir "html" "solarized.css" - diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal index 93e3fc82..688a48c1 100644 --- a/haddock-library/haddock-library.cabal +++ b/haddock-library/haddock-library.cabal @@ -95,10 +95,10 @@ test-suite spec -- version of `hspec` & `hspec-discover` to ensure -- intercompatibility build-depends: - , hspec >= 2.4.4 && < 2.9 + , hspec >= 2.4.4 && < 2.10 build-tool-depends: - , hspec-discover:hspec-discover >= 2.4.4 && < 2.9 + , hspec-discover:hspec-discover >= 2.4.4 && < 2.10 test-suite fixtures type: exitcode-stdio-1.0 -- cgit v1.2.3