Skip to content

Commit

Permalink
Merge pull request #8503 from Mikolaj/update-CI-to-GHA-on-GHC-9.4
Browse files Browse the repository at this point in the history
Work around CI problem from ghcup switch to GHC 9.2
  • Loading branch information
Mikolaj authored Sep 30, 2022
2 parents 2b6c376 + a66f183 commit 67b3c8d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/quick-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ jobs:
- name: ghcup
run: |
ghcup config set cache true
ghcup install ghc recommended
ghcup set ghc recommended
ghcup install ghc 8.10.7
ghcup set ghc 8.10.7
- name: Update Hackage index
run: cabal v2-update
- name: Install doctest
Expand Down
12 changes: 6 additions & 6 deletions cabal-dev-scripts/cabal-dev-scripts.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ executable gen-spdx
hs-source-dirs: src
ghc-options: -Wall
build-depends:
, aeson ^>=1.4.1.0 || ^>=1.5.2.0
, base >=4.10 && <4.16
, aeson ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.1.1.0
, base >=4.10 && <4.17
, bytestring
, containers
, Diff ^>=0.4
, lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1
, lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1 || ^>=5.2
, optparse-applicative ^>=0.15.1.0 || ^>=0.16.0.0
, text
, zinza ^>=0.2
Expand All @@ -34,12 +34,12 @@ executable gen-spdx-exc
hs-source-dirs: src
ghc-options: -Wall
build-depends:
, aeson ^>=1.4.1.0 || ^>=1.5.2.0
, base >=4.10 && <4.16
, aeson ^>=1.4.1.0 || ^>=1.5.2.0 || ^>=2.1.1.0
, base >=4.10 && <4.17
, bytestring
, containers
, Diff ^>=0.4
, lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1
, lens ^>=4.18.1 || ^>=4.19.1 || ^>=5.0.1 || ^>=5.2
, optparse-applicative ^>=0.15.1.0 || ^>=0.16.0.0
, text
, zinza ^>=0.2
Expand Down

0 comments on commit 67b3c8d

Please sign in to comment.