Merge pull request #270 from haskell-nix/srk/ci

CI updates
haskell-nix · Nov 29, 2023 · 92b83e8 · 92b83e8
2 parents 0c692e9 + d78ce4a
commit 92b83e8
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
diff --git a/.github/workflows/ci.dhall b/.github/workflows/ci.dhall
@@ -4,7 +4,14 @@ let haskellCi =
 let defSteps = haskellCi.defaultCabalSteps
 
 in    haskellCi.generalCi
-        (haskellCi.withNix defSteps)
+        ( haskellCi.withNix
+            ( defSteps
+              with extraSteps.pre
+                   =
+                    defSteps.extraSteps.pre
+                  # [ haskellCi.installCachixStep "hnix-store" ]
+            )
+        )
         haskellCi.DhallMatrix::{
         , ghc =
           [ haskellCi.GHC.GHC963

diff --git a/.github/workflows/ci.dhall.frozen b/.github/workflows/ci.dhall.frozen
@@ -1,11 +1,18 @@
 let haskellCi =
       https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
-        sha256:9e49c0d57a38ab766825b3d2de6656d998b15eec873982db97d590ef58298601
+        sha256:5d7058a7684fd5315467b562853bd1c4a43da691c09293d3715ee739dfa26e08
 
 let defSteps = haskellCi.defaultCabalSteps
 
 in    haskellCi.generalCi
-        (haskellCi.withNix defSteps)
+        ( haskellCi.withNix
+            ( defSteps
+              with extraSteps.pre
+                   =
+                    defSteps.extraSteps.pre
+                  # [ haskellCi.installCachixStep "hnix-store" ]
+            )
+        )
         haskellCi.DhallMatrix::{
         , ghc =
           [ haskellCi.GHC.GHC963

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,9 +4,13 @@ jobs:
     name: "GHC ${{ matrix.ghc }}, Cabal ${{ matrix.cabal }}, OS ${{ matrix.os }}"
     "runs-on": "${{ matrix.os }}"
     steps:
-    - uses: "cachix/install-nix-action@v23"
+    - uses: "cachix/install-nix-action@v24"
       with:
         nix_path: "nixpkgs=channel:nixos-unstable"
+    - uses: "cachix/cachix-action@v13"
+      with:
+        name: "hnix-store"
+        signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
     - uses: "actions/checkout@v4"
       with:
         submodules: recursive

diff --git a/cabal.project b/cabal.project
@@ -1,3 +1,6 @@
+test: true
+benchmarks: true
+
 packages:
   ./hnix-store-core/hnix-store-core.cabal
   ./hnix-store-db/hnix-store-db.cabal

diff --git a/cabal.project.local.ci b/cabal.project.local.ci
@@ -1,5 +1,3 @@
-tests: True
-
 package hnix-store-core
   ghc-options: -Wunused-packages -Wall -Werror