update dependencies (#11)

bellroy · Jun 30, 2024 · e3f53f9 · e3f53f9
1 parent cd5238a
commit e3f53f9
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 44 deletions.
diff --git 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.16.3
+# version: 0.19.20240608
 #
-# REGENDATA ("0.16.3",["github","timeline.cabal"])
+# REGENDATA ("0.19.20240608",["github","timeline.cabal"])
 #
 name: Haskell-CI
 on:
@@ -23,24 +23,34 @@ jobs:
     timeout-minutes:
       60
     container:
-      image: buildpack-deps:bionic
+      image: buildpack-deps:jammy
     continue-on-error: ${{ matrix.allow-failure }}
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.6.2
+          - compiler: ghc-9.10.1
             compilerKind: ghc
-            compilerVersion: 9.6.2
+            compilerVersion: 9.10.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.4.4
+          - compiler: ghc-9.8.2
             compilerKind: ghc
-            compilerVersion: 9.4.4
+            compilerVersion: 9.8.2
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.2.6
+          - compiler: ghc-9.6.5
             compilerKind: ghc
-            compilerVersion: 9.2.6
+            compilerVersion: 9.6.5
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.4.8
+            compilerKind: ghc
+            compilerVersion: 9.4.8
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.2.8
+            compilerKind: ghc
+            compilerVersion: 9.2.8
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-8.10.7
@@ -55,10 +65,10 @@ jobs:
           apt-get update
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
           mkdir -p "$HOME/.ghcup/bin"
-          curl -sL https://downloads.haskell.org/ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 > "$HOME/.ghcup/bin/ghcup"
+          curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup"
           chmod a+x "$HOME/.ghcup/bin/ghcup"
           "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
-          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
+          "$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
         env:
           HCKIND: ${{ matrix.compilerKind }}
           HCNAME: ${{ matrix.compiler }}
@@ -70,11 +80,13 @@ jobs:
           echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"
           echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"
           HCDIR=/opt/$HCKIND/$HCVER
-          HC=$HOME/.ghcup/bin/$HCKIND-$HCVER
+          HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
+          HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
+          HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
           echo "HC=$HC" >> "$GITHUB_ENV"
-          echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"
-          echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"
-          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
+          echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
+          echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
+          echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
           HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
@@ -131,7 +143,7 @@ jobs:
           chmod a+x $HOME/.cabal/bin/cabal-plan
           cabal-plan --version
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: source
       - name: initial cabal.project for sdist
@@ -159,15 +171,15 @@ jobs:
           echo "    ghc-options: -Werror=missing-methods" >> cabal.project
           cat >> cabal.project <<EOF
           EOF
-          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(timeline)$/; }' >> cabal.project.local
+          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(timeline)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local
       - name: dump install plan
         run: |
           $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
           cabal-plan
       - name: restore cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store
@@ -197,7 +209,7 @@ jobs:
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
       - name: save cache
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: always()
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}

diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@
 .direnv/
 .envrc
 result
-dist-newstyle
+dist-newstyle
+cabal.project.local
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -6,13 +6,7 @@
   };
 
   outputs = inputs: inputs.bellroy-nix-foss.lib.haskellProject {
-    cabalPackages = [
-      {
-        name = "timeline";
-        path = ./package.nix;
-      }
-    ];
-    supportedCompilers = [ "ghc8107" "ghc92" "ghc94" "ghc962" ];
-    defaultCompiler = "ghc92";
+    supportedCompilers = [ "ghc92" "ghc94" "ghc96" "ghc98" "ghc910" ];
+    defaultCompiler = "ghc96";
   };
 }
diff --git a/timeline.cabal b/timeline.cabal
@@ -15,7 +15,7 @@ author:             Bellroy Tech Team <[email protected]>
 maintainer:         Bellroy Tech Team <[email protected]>
 category:           Development
 build-type:         Simple
-tested-with:        GHC ==8.10.7 || ==9.2.6 || ==9.4.4 || ==9.6.2
+tested-with:        GHC ==8.10.7 || ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2 || ==9.10.1
 extra-source-files:
   CHANGELOG.md
   README.md
@@ -27,12 +27,13 @@ source-repository head
 
 common deps
   build-depends:
-    , base                 >=4.14.3   && <4.20
+    , base                 >=4.14.3   && <4.21
     , containers           >=0.6.5    && <0.7.1
     , hedgehog             >=1.1      && <1.5
     , indexed-traversable  >=0.1.2    && <0.2
     , text                 ^>=1.2.4.1 || >=2.0 && <2.2
-    , time                 >=1.9.3    && <1.13
+    , time                 >=1.9.3    && <1.15
+
 library
   import:           deps
   hs-source-dirs:   src/
@@ -44,7 +45,7 @@ library
   ghc-options:      -Wall -fno-warn-unused-do-bind -fno-warn-unused-imports
   build-depends:
     , semigroupoids     >=5.3.7  && <6.1
-    , template-haskell  >=2.16.0 && <2.22
+    , template-haskell  >=2.16.0 && <2.23
     , th-compat         >=0.1.4  && <0.2
 
 test-suite tests