From 4d63de7e9cf7b91f73ad74e929b59c6d1d8fa870 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Wed, 15 Oct 2025 10:36:36 +0200 Subject: [PATCH 1/2] Update generic-lens version bound To address https://github.com/commercialhaskell/stackage/issues/7828 --- capability.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capability.cabal b/capability.cabal index d387ac4..2247dc4 100644 --- a/capability.cabal +++ b/capability.cabal @@ -63,7 +63,7 @@ library , constraints >= 0.1 && < 0.15 , dlist >= 0.8 && < 1.1 , exceptions >= 0.6 && < 0.11 - , generic-lens >= 2.0 && < 2.3 + , generic-lens >= 2.0 && < 2.4 , lens >= 4.16 && < 5.4 , monad-control >= 1.0 && < 1.1 , mtl >= 2.0 && < 3.0 From 0c6fe24d025d0151115cef50638ee6c2132cd061 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Wed, 15 Oct 2025 10:38:37 +0200 Subject: [PATCH 2/2] Update GH actions cache --- .github/workflows/ci.yaml | 70 +++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ef94947..eb2821a 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,43 +10,43 @@ jobs: NIXSHELL: nix-shell --pure runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - uses: cachix/install-nix-action@v12 - with: - nix_path: nixpkgs=channel:nixos-unstable - - name: Build Nix dependencies - run: $NIXSHELL --run "echo '=== Installed ==='" - - name: Cache Cabal dependencies - uses: actions/cache@v2 - with: - path: | - ~/.cabal/packages - ~/.cabal/store - dist-newstyle - key: cache-${{ runner.os }}-${{ hashFiles('nixpkgs.nix') }}-v${{ env.cache-invalidation-key }}-${{ hashFiles('capability.cabal') }}-${{ github.sha }} - restore-keys: cache-${{ runner.os }}-${{ hashFiles('nixpkgs.nix') }}-v${{ env.cache-invalidation-key }}-${{ hashFiles('capability.cabal') }}- - - name: Update Cabal's database - run: $NIXSHELL --run "cabal update" - - name: Build Cabal's dependencies - run: $NIXSHELL --run "cabal build --enable-tests --enable-benchmarks --dependencies-only" - - name: Build - run: $NIXSHELL --run "cabal build --flag=dev " - - name: Test - run: $NIXSHELL --run "cabal --flag=dev test" - - name: Haddock - run: $NIXSHELL --run "cabal haddock" + - uses: actions/checkout@v2.3.4 + - uses: cachix/install-nix-action@v12 + with: + nix_path: nixpkgs=channel:nixos-unstable + - name: Build Nix dependencies + run: $NIXSHELL --run "echo '=== Installed ==='" + - name: Cache Cabal dependencies + uses: actions/cache@v4 + with: + path: | + ~/.cabal/packages + ~/.cabal/store + dist-newstyle + key: cache-${{ runner.os }}-${{ hashFiles('nixpkgs.nix') }}-v${{ env.cache-invalidation-key }}-${{ hashFiles('capability.cabal') }}-${{ github.sha }} + restore-keys: cache-${{ runner.os }}-${{ hashFiles('nixpkgs.nix') }}-v${{ env.cache-invalidation-key }}-${{ hashFiles('capability.cabal') }}- + - name: Update Cabal's database + run: $NIXSHELL --run "cabal update" + - name: Build Cabal's dependencies + run: $NIXSHELL --run "cabal build --enable-tests --enable-benchmarks --dependencies-only" + - name: Build + run: $NIXSHELL --run "cabal build --flag=dev " + - name: Test + run: $NIXSHELL --run "cabal --flag=dev test" + - name: Haddock + run: $NIXSHELL --run "cabal haddock" stack-ghc9: name: Build on GHC 9.2 runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 - - name: Cache dependencies - uses: actions/cache@v2.1.6 - with: - path: ~/.stack - key: stack-ghc9-${{ runner.os }}-v${{ env.cache-invalidation-key }}-${{ hashFiles('stack-ghc9.yaml.lock', 'capability.cabal') }} - - name: Upgrade stack - run: stack upgrade - - name: Build - run: stack --stack-yaml=stack-ghc9.yaml build --pedantic --test --bench --no-run-tests --no-run-benchmarks + - uses: actions/checkout@v2.3.4 + - name: Cache dependencies + uses: actions/cache@v4 + with: + path: ~/.stack + key: stack-ghc9-${{ runner.os }}-v${{ env.cache-invalidation-key }}-${{ hashFiles('stack-ghc9.yaml.lock', 'capability.cabal') }} + - name: Upgrade stack + run: stack upgrade + - name: Build + run: stack --stack-yaml=stack-ghc9.yaml build --pedantic --test --bench --no-run-tests --no-run-benchmarks