diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 70e33f4..fde6282 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,7 @@ jobs: - "9.0.2" - "9.2.4" - "9.4.8" + - "9.6.6" exclude: - os: macOS-latest ghc: 8.10.7 @@ -46,16 +47,18 @@ jobs: - os: windows-latest ghc: 8.4.4 - # On Windows 9.4 we get the following, so disabling - # it for now. + # On Windows 9.4 and 9.6 we get the following, so disabling + # them for now. # - # ghc-9.4.8.exe: C:\sr\ghc-9.4.8\hashable-1.4.7.0-30c04c59e98d75fc2789d517f4b0591876c2983e\lib\libHShashable-1.4.7.0-30c04c59e98d75fc2789d517f4b0591876c2983e.a(#5:FFI.o): Not a x86_64 PE+ file. - # ghc-9.4.8.exe: Unknown COFF 4 type in getHeaderInfo. + # ghc-9.6.6.exe: C:\sr\ghc-9.6.6\hashable-1.4.7.0-30c04c59e98d75fc2789d517f4b0591876c2983e\lib\libHShashable-1.4.7.0-30c04c59e98d75fc2789d517f4b0591876c2983e.a(#5:FFI.o): Not a x86_64 PE+ file. + # ghc-9.6.6.exe: Unknown COFF 4 type in getHeaderInfo. # # : error: - # loadArchive "C:\\sr\\ghc-9.4.8\\hashable-1.4.7.0-30c04c59e98d75fc2789d517f4b0591876c2983e\\lib\\libHShashable-1.4.7.0-30c04c59e98d75fc2789d517f4b0591876c2983e.a": failed + # loadArchive "C:\\sr\\ghc-9.6.6\\hashable-1.4.7.0-30c04c59e98d75fc2789d517f4b0591876c2983e\\lib\\libHShashable-1.4.7.0-30c04c59e98d75fc2789d517f4b0591876c2983e.a": failed - os: windows-latest ghc: 9.4.8 + - os: windows-latest + ghc: 9.6.6 steps: - uses: actions/checkout@v3 diff --git a/summoner-cli/src/Summoner/CLI.hs b/summoner-cli/src/Summoner/CLI.hs index da93416..73812b1 100644 --- a/summoner-cli/src/Summoner/CLI.hs +++ b/summoner-cli/src/Summoner/CLI.hs @@ -423,7 +423,7 @@ targetsP d = do cExe <- execP d cTest <- testP d cBench <- benchmarkP d - pure mempty + pure (mempty :: PartialConfig) { cGitHub = cGitHub , cGhActions = cGhActions , cTravis = cTravis diff --git a/summoner-cli/summoner.cabal b/summoner-cli/summoner.cabal index 2102eee..a015811 100644 --- a/summoner-cli/summoner.cabal +++ b/summoner-cli/summoner.cabal @@ -74,7 +74,7 @@ source-repository head location: git@github.com:kowainik/summoner.git common common-options - build-depends: base >= 4.11 && < 4.18 + build-depends: base >= 4.11 && < 4.19 , relude >= 1.0.0.0 && < 1.3 mixins: base hiding (Prelude) @@ -152,7 +152,7 @@ library , generic-data >= 0.8.0.0 && < 1.1 , gitrev ^>= 1.3.1 , microaeson ^>= 0.1.0.0 - , optparse-applicative >= 0.16 && < 0.18 + , optparse-applicative >= 0.16 && < 0.19 , process ^>= 1.6.1.0 , shellmet ^>= 0.0.3.0 , time >= 1.8 && < 1.14 @@ -193,6 +193,6 @@ test-suite summoner-test , hspec >= 2.4.8 , hspec-hedgehog ^>= 0.0.1.1 , tomland - , tree-diff >= 0.0.2 && < 0.3 + , tree-diff >= 0.0.2 && < 0.4 , summoner , validation-selective diff --git a/summoner-tui/summoner-tui.cabal b/summoner-tui/summoner-tui.cabal index 498d662..b236b63 100644 --- a/summoner-tui/summoner-tui.cabal +++ b/summoner-tui/summoner-tui.cabal @@ -28,7 +28,7 @@ source-repository head location: git@github.com:kowainik/summoner.git common common-options - build-depends: base >= 4.11 && < 4.18 + build-depends: base >= 4.11 && < 4.19 , relude >= 1.0.0.0 && < 1.3 mixins: base hiding (Prelude) @@ -81,14 +81,14 @@ library autogen-modules: Paths_summoner_tui other-modules: Paths_summoner_tui - build-depends: brick >= 1.0 && < 1.4 + build-depends: brick >= 1.0 && < 2.5 , colourista ^>= 0.1 , directory ^>= 1.3.0.2 , microlens ^>= 0.4 , microlens-th ^>= 0.4 , summoner ^>= 2.0.0.0 , validation-selective >= 0.0.0.0 && < 0.3 - , vty >= 5.36 && < 5.38 + , vty >= 5.36 && < 6.0 executable summon-tui import: common-options