diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index d37d22d..6779988 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20250908 +# version: 0.19.20251211 # -# REGENDATA ("0.19.20250908",["github","cabal.project"]) +# REGENDATA ("0.19.20251211",["github","cabal.project"]) # name: Haskell-CI on: @@ -20,6 +20,9 @@ on: pull_request: branches: - master + merge_group: + branches: + - master jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} @@ -32,9 +35,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.14.0.20250819 + - compiler: ghc-9.14.0.20251128 compilerKind: ghc - compilerVersion: 9.14.0.20250819 + compilerVersion: 9.14.0.20251128 setup-method: ghcup-prerelease allow-failure: false - compiler: ghc-9.12.2 @@ -42,9 +45,9 @@ jobs: compilerVersion: 9.12.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.10.2 + - compiler: ghc-9.10.3 compilerKind: ghc - compilerVersion: 9.10.2 + compilerVersion: 9.10.3 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.4 diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index 7bfda68..468cec1 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -22,7 +22,7 @@ jobs: ghc: '9.12' steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - uses: haskell-actions/setup@v2 id: setup @@ -32,7 +32,7 @@ jobs: cabal-update: false - name: Restore cache - uses: actions/cache/restore@v4 + uses: actions/cache/restore@v5 id: cache env: key: ${{ runner.os }}-stack-${{ steps.setup.outputs.stack-version }}-ghc-${{ steps.setup.outputs.ghc-version }} @@ -56,7 +56,7 @@ jobs: run: stack test --stack-yaml=stack-${{ matrix.ghc }}.yaml --system-ghc - name: Save cache - uses: actions/cache/save@v4 + uses: actions/cache/save@v5 if: always() with: key: ${{ steps.cache.outputs.cache-primary-key }} diff --git a/example-client/example-client.cabal b/example-client/example-client.cabal index 10fe4f8..ff76b0d 100644 --- a/example-client/example-client.cabal +++ b/example-client/example-client.cabal @@ -14,7 +14,7 @@ cabal-version: >=1.10 tested-with: GHC == 9.14.1 GHC == 9.12.2 - GHC == 9.10.2 + GHC == 9.10.3 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal index 17afb7b..5c729b2 100644 --- a/hackage-repo-tool/hackage-repo-tool.cabal +++ b/hackage-repo-tool/hackage-repo-tool.cabal @@ -1,6 +1,8 @@ cabal-version: 1.18 name: hackage-repo-tool version: 0.1.1.5 +-- remove x-revision when you bump the version +x-revision: 1 build-type: Simple synopsis: Manage secure file-based package repositories @@ -25,7 +27,7 @@ bug-reports: https://github.com/haskell/hackage-security/issues tested-with: GHC == 9.14.1 GHC == 9.12.2 - GHC == 9.10.2 + GHC == 9.10.3 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 @@ -70,7 +72,7 @@ executable hackage-repo-tool if !os(windows) build-depends: unix >= 2.7.2.2 && < 2.9 - build-depends: microlens >= 0.4.9.1 && < 0.5, + build-depends: microlens >= 0.4.9.1 && < 0.6, -- microlens-0.4.9.1 is the version in Stackage LTS-12.26 (GHC 8.4) optparse-applicative >= 0.13 && < 0.20, tar >= 0.5 && < 0.8, diff --git a/hackage-root-tool/hackage-root-tool.cabal b/hackage-root-tool/hackage-root-tool.cabal index 2290a75..0f6820f 100644 --- a/hackage-root-tool/hackage-root-tool.cabal +++ b/hackage-root-tool/hackage-root-tool.cabal @@ -18,7 +18,7 @@ cabal-version: >=1.10 tested-with: GHC == 9.14.1 GHC == 9.12.2 - GHC == 9.10.2 + GHC == 9.10.3 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 diff --git a/hackage-security-HTTP/hackage-security-HTTP.cabal b/hackage-security-HTTP/hackage-security-HTTP.cabal index 3a26dff..6118b78 100644 --- a/hackage-security-HTTP/hackage-security-HTTP.cabal +++ b/hackage-security-HTTP/hackage-security-HTTP.cabal @@ -1,6 +1,8 @@ cabal-version: 1.18 name: hackage-security-HTTP version: 0.1.1.3 +-- remove x-revision when you bump the version +x-revision: 1 synopsis: Hackage security bindings against the HTTP library description: The hackage security library provides a 'HttpLib' @@ -20,7 +22,7 @@ build-type: Simple tested-with: GHC == 9.14.1 GHC == 9.12.2 - GHC == 9.10.2 + GHC == 9.10.3 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 @@ -42,7 +44,7 @@ library exposed-modules: Hackage.Security.Client.Repository.HttpLib.HTTP build-depends: base >= 4.11 && < 4.23, bytestring >= 0.10.8.2 && < 0.13, - HTTP >= 4000.2.19 && < 4000.5, + HTTP >= 4000.2.19 && < 4000.6, mtl >= 2.2.2 && < 2.4, network-uri >= 2.6 && < 2.7, network >= 2.6 && < 3.3, diff --git a/hackage-security-curl/hackage-security-curl.cabal b/hackage-security-curl/hackage-security-curl.cabal index 2515968..b442121 100644 --- a/hackage-security-curl/hackage-security-curl.cabal +++ b/hackage-security-curl/hackage-security-curl.cabal @@ -18,7 +18,7 @@ cabal-version: >=1.10 tested-with: GHC == 9.14.1 GHC == 9.12.2 - GHC == 9.10.2 + GHC == 9.10.3 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 diff --git a/hackage-security-http-client/hackage-security-http-client.cabal b/hackage-security-http-client/hackage-security-http-client.cabal index 2cfcbd8..6ad871a 100644 --- a/hackage-security-http-client/hackage-security-http-client.cabal +++ b/hackage-security-http-client/hackage-security-http-client.cabal @@ -18,7 +18,7 @@ extra-source-files: ChangeLog.md tested-with: GHC == 9.14.1 GHC == 9.12.2 - GHC == 9.10.2 + GHC == 9.10.3 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index fcf1e0f..6487608 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -1,6 +1,8 @@ cabal-version: 1.18 name: hackage-security version: 0.6.3.2 +-- remove x-revision when you bump the version +x-revision: 1 synopsis: Hackage security library description: The hackage security library provides both server and @@ -33,7 +35,7 @@ build-type: Simple tested-with: GHC == 9.14.1 GHC == 9.12.2 - GHC == 9.10.2 + GHC == 9.10.3 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 @@ -214,7 +216,7 @@ test-suite TestSuite -- tasty-1.1.0.4 is the version in Stackage LTS 12.26 (GHC 8.4) tasty-hunit == 0.10.*, tasty-quickcheck >= 0.10 && < 1, - QuickCheck >= 2.11 && < 2.17, + QuickCheck >= 2.11 && < 2.18, aeson >= 1.4 && < 1.6 || >= 2.0 && < 2.3, vector >= 0.12 && < 0.14, unordered-containers >= 0.2.8.0 && < 0.3, diff --git a/precompute-fileinfo/precompute-fileinfo.cabal b/precompute-fileinfo/precompute-fileinfo.cabal index 7bef34d..7674c4f 100644 --- a/precompute-fileinfo/precompute-fileinfo.cabal +++ b/precompute-fileinfo/precompute-fileinfo.cabal @@ -17,7 +17,7 @@ cabal-version: >=1.10 tested-with: GHC == 9.14.1 GHC == 9.12.2 - GHC == 9.10.2 + GHC == 9.10.3 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8