Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow building with GHC 9.6 #200

Merged
merged 6 commits into from
Aug 3, 2023
Merged

Allow building with GHC 9.6 #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0717e0
Allow building with GHC 9.6
RyanGlScott Apr 12, 2023
6c54120
Fix -Wtype-equality-requires-operators warning
RyanGlScott Apr 12, 2023
2e94e9b
CI: Always save cache, even on failure
RyanGlScott Jul 28, 2023
80a8bd2
CI: Update test GHCs to latest minor versions
RyanGlScott Jul 28, 2023
4a20f82
CI: Test GHC 9.6.2
RyanGlScott Jul 28, 2023
ee8bfbd
CI: Use cabal-install-3.10.1.0
RyanGlScott Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ghc-ver: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.1","9.4.3"]
ghc-ver: ["8.6.5", "8.8.4", "8.10.7", "9.0.2", "9.2.8", "9.4.5", "9.6.2"]
cabal-ver: ["3.10.1.0"]
# complete all jobs
fail-fast: false
name: Argo - GHC v${{ matrix.ghc-ver }} - ubuntu-latest
Expand All @@ -26,13 +27,14 @@ jobs:
uses: actions/checkout@v2
with:
submodules: true
- name: Get GHC
- name: Get GHC and Cabal
uses: haskell/actions/setup@v1
id: setup-haskell
with:
ghc-version: ${{ matrix.ghc-ver }}
- name: Cache
uses: actions/cache@v1
cabal-version: ${{ matrix.cabal-ver }}
- uses: actions/cache/restore@v3
name: Restore cabal store cache
with:
path: /home/runner/.cabal/store/ghc-${{ matrix.ghc-ver }}
# Prefer previous SHA hash if it is still cached
Expand Down Expand Up @@ -60,3 +62,10 @@ jobs:
- name: Python argo-client unit tests
working-directory: ./python
run: poetry run python -m unittest discover --verbose tests
- uses: actions/cache/save@v3
name: Save cabal store cache
if: always()
with:
path: /home/runner/.cabal/store/ghc-${{ matrix.ghc-ver }}
# Prefer previous SHA hash if it is still cached
key: linux-${{ matrix.ghc-ver }}-${{ hashFiles('cabal.project.freeze') }}-${{ github.sha }}
8 changes: 4 additions & 4 deletions argo/argo.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ common warnings

common deps
build-depends:
base >= 4.11.1.0 && < 4.18,
aeson >= 1.4.2 && < 2.2,
base >= 4.11.1.0 && < 4.19,
aeson >= 1.4.2 && < 2.3,
async ^>= 2.2,
bytestring >= 0.10.8 && < 0.12,
containers >= 0.5.11 && <0.7,
Expand All @@ -41,9 +41,9 @@ common deps
filepath ^>= 1.4,
hashable >= 1.2 && < 1.5,
http-types ^>= 0.12,
mtl ^>= 2.2,
mtl >= 2.2 && < 2.4,
network >= 3.0.1,
optparse-applicative >= 0.14 && < 0.17,
optparse-applicative >= 0.14 && < 0.19,
panic,
safe ^>= 0.3,
scientific ^>= 0.3,
Expand Down
1 change: 1 addition & 0 deletions argo/src/Argo/Doc.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{-# LANGUAGE GADTs #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeOperators #-}

module Argo.Doc (LinkTarget(..), Block(..), Inline(..), Described(..), DescribedMethod(..), datatype) where

Expand Down
4 changes: 2 additions & 2 deletions file-echo-api/file-echo-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ common warnings

common deps
build-depends:
base >=4.11.1.0 && <4.18,
base >=4.11.1.0 && <4.19,
argo,
aeson >= 1.4.2,
bytestring >= 0.10.8 && < 0.12,
containers >=0.5.11 && <0.7,
directory ^>= 1.3.1,
optparse-applicative >= 0.14 && < 0.17,
optparse-applicative >= 0.14 && < 0.19,
scientific ^>= 0.3,
text >= 1.2.3 && < 2.1,
time,
Expand Down
Loading