From 3779682dcf8afbd4facdfd7c8a8128725c148ad1 Mon Sep 17 00:00:00 2001 From: Felix Paulusma Date: Sat, 6 Jul 2024 23:22:47 +0200 Subject: [PATCH 1/2] some miscellaneous CI and cabal/stack work --- .github/workflows/ci.yml | 9 ++++----- package.yaml | 10 +++++----- safe-json.cabal | 12 ++++++------ stack.yaml | 6 ++++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bfae96e..d3be8dc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ jobs: cabal: name: cabal / ${{ matrix.os }} / ghc ${{ matrix.ghc }} runs-on: ${{ matrix.os }} - continue-on-error: ${{ matrix.ghc == '9.8.1' }} + continue-on-error: ${{ matrix.ghc == '9.10.1' }} strategy: matrix: os: @@ -18,13 +18,12 @@ jobs: - macOS-latest cabal: ["latest"] ghc: - - "8.10.7" - "9.0.2" - "9.2.8" - "9.4.8" - - "9.6.5" + - "9.6.6" - "9.8.2" - # - "9.10.1" + - "9.10.1" steps: - uses: actions/checkout@v2 @@ -70,7 +69,7 @@ jobs: - "--resolver lts-19" # GHC 9.0.2 - "--resolver lts-20" # GHC 9.2.8 - "--resolver lts-21" # GHC 9.4.8 - - "--resolver lts-22" # GHC 9.6.4 + - "--resolver lts-22" # GHC 9.6.6 - "--resolver nightly" # GHC 9.8.2 steps: diff --git a/package.yaml b/package.yaml index ce70ce9..b7596d1 100644 --- a/package.yaml +++ b/package.yaml @@ -12,7 +12,7 @@ tested-with: GHC == 8.10.7 , GHC == 9.0.2 , GHC == 9.2.8 , GHC == 9.4.8 - , GHC == 9.6.4 + , GHC == 9.6.6 , GHC == 9.8.2 extra-source-files: @@ -54,11 +54,11 @@ dependencies: - bytestring >= 0.10.8.1 && < 1 - containers >= 0.5.7.1 && < 0.8 - dlist >= 0.8.0.3 && < 2 -- hashable >= 1.2.6.1 && < 1.5 +- hashable >= 1.2.6.1 && < 1.6 - scientific >= 0.3.5.2 && < 0.4 - tasty >= 0.11.3 && < 1.6 - tasty-hunit >= 0.9.2 && < 0.11 -- tasty-quickcheck >= 0.8.4 && < 0.11 +- tasty-quickcheck >= 0.8.4 && < 0.12 - text >= 1.2.3 && < 2.2 - time >= 1.6.0.1 && < 1.15 - unordered-containers >= 0.2.9 && < 0.3 @@ -100,7 +100,7 @@ tests: - tasty - tasty-hunit - tasty-quickcheck - - temporary >= 1.2.1.1 && < 1.4 - - uuid >= 1.3.13 && < 1.4 + - temporary >= 1.2.1.1 + - uuid >= 1.3.13 default-extensions: - OverloadedStrings diff --git a/safe-json.cabal b/safe-json.cabal index 187845e..f15c99d 100644 --- a/safe-json.cabal +++ b/safe-json.cabal @@ -28,7 +28,7 @@ license: MIT license-file: LICENSE build-type: Simple tested-with: - GHC == 8.10.7 , GHC == 9.0.2 , GHC == 9.2.8 , GHC == 9.4.8 , GHC == 9.6.3 , GHC == 9.8.1 + GHC == 8.10.7 , GHC == 9.0.2 , GHC == 9.2.8 , GHC == 9.4.8 , GHC == 9.6.6 , GHC == 9.8.2 extra-source-files: README.md ChangeLog.md @@ -67,11 +67,11 @@ library , bytestring >=0.10.8.1 && <1 , containers >=0.5.7.1 && <0.8 , dlist >=0.8.0.3 && <2 - , hashable >=1.2.6.1 && <1.5 + , hashable >=1.2.6.1 && <1.6 , scientific >=0.3.5.2 && <0.4 , tasty >=0.11.3 && <1.6 , tasty-hunit >=0.9.2 && <0.11 - , tasty-quickcheck >=0.8.4 && <0.11 + , tasty-quickcheck >=0.8.4 && <0.12 , text >=1.2.3 && <2.2 , time >=1.6.0.1 && <1.15 , unordered-containers >=0.2.9 && <0.3 @@ -104,18 +104,18 @@ test-suite safe-json-test , bytestring >=0.10.8.1 && <1 , containers >=0.5.7.1 && <0.8 , dlist >=0.8.0.3 && <2 - , hashable >=1.2.6.1 && <1.5 + , hashable >=1.2.6.1 && <1.6 , quickcheck-instances >=0.3.16 && <0.4 , safe-json , scientific >=0.3.5.2 && <0.4 , tasty , tasty-hunit , tasty-quickcheck - , temporary >=1.2.1.1 && <1.4 + , temporary >=1.2.1.1 , text >=1.2.3 && <2.2 , time >=1.6.0.1 && <1.15 , unordered-containers >=0.2.9 && <0.3 - , uuid >=1.3.13 && <1.4 + , uuid >=1.3.13 , uuid-types >=1.0.3 && <1.1 , vector >=0.12.0.1 && <0.14 default-language: Haskell2010 diff --git a/stack.yaml b/stack.yaml index 3bdecab..de36523 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,7 +15,7 @@ # resolver: # name: custom-snapshot # location: "./custom-snapshot.yaml" -resolver: lts-22.17 +resolver: lts-22.28 # User packages to be built. # Various formats can be used as shown in the example below. @@ -40,7 +40,9 @@ packages: # Dependency packages to be pulled from upstream that are not in the resolver # (e.g., acme-missiles-0.3) extra-deps: [] -# - text-2.1 + # - hashable-1.5.0.0 + # - tasty-1.5.1 + # - tasty-quickcheck-0.11 # allow-newer: true From d1316c525c41522b07952350b47ea8963769e2bf Mon Sep 17 00:00:00 2001 From: Felix Paulusma Date: Sat, 6 Jul 2024 23:29:32 +0200 Subject: [PATCH 2/2] ci.yml: updating all actions --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3be8dc..50bc197 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,17 +26,17 @@ jobs: - "9.10.1" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 #if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' - - uses: haskell/actions/setup@v2 + - uses: haskell-actions/setup@v2 id: setup-haskell-cabal name: Setup Haskell with: ghc-version: ${{ matrix.ghc }} cabal-version: ${{ matrix.cabal }} - - uses: actions/cache@v1 + - uses: actions/cache@v4 name: Cache cabal-store with: path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }} @@ -73,16 +73,16 @@ jobs: - "--resolver nightly" # GHC 9.8.2 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 #if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master' - - uses: haskell/actions/setup@v1 + - uses: haskell-actions/setup@v2 name: Setup Haskell Stack with: stack-version: ${{ matrix.stack }} enable-stack: true - - uses: actions/cache@v1 + - uses: actions/cache@v4 name: Cache ~/.stack with: path: ~/.stack