Skip to content

Commit f2f6541

Browse files
committed
ci: update, restore cachix step
1 parent 134f131 commit f2f6541

File tree

3 files changed

+22
-4
lines changed

3 files changed

+22
-4
lines changed

.github/workflows/ci.dhall

+8-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@ let haskellCi =
44
let defSteps = haskellCi.defaultCabalSteps
55

66
in haskellCi.generalCi
7-
(haskellCi.withNix defSteps)
7+
( haskellCi.withNix
8+
( defSteps
9+
with extraSteps.pre
10+
=
11+
defSteps.extraSteps.pre
12+
# [ haskellCi.installCachixStep "hnix-store" ]
13+
)
14+
)
815
haskellCi.DhallMatrix::{
916
, ghc =
1017
[ haskellCi.GHC.GHC963

.github/workflows/ci.dhall.frozen

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
let haskellCi =
22
https://raw.githubusercontent.com/sorki/github-actions-dhall/main/haskell-ci.dhall
3-
sha256:9e49c0d57a38ab766825b3d2de6656d998b15eec873982db97d590ef58298601
3+
sha256:5d7058a7684fd5315467b562853bd1c4a43da691c09293d3715ee739dfa26e08
44

55
let defSteps = haskellCi.defaultCabalSteps
66

77
in haskellCi.generalCi
8-
(haskellCi.withNix defSteps)
8+
( haskellCi.withNix
9+
( defSteps
10+
with extraSteps.pre
11+
=
12+
defSteps.extraSteps.pre
13+
# [ haskellCi.installCachixStep "hnix-store" ]
14+
)
15+
)
916
haskellCi.DhallMatrix::{
1017
, ghc =
1118
[ haskellCi.GHC.GHC963

.github/workflows/ci.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ jobs:
44
name: "GHC ${{ matrix.ghc }}, Cabal ${{ matrix.cabal }}, OS ${{ matrix.os }}"
55
"runs-on": "${{ matrix.os }}"
66
steps:
7-
- uses: "cachix/install-nix-action@v23"
7+
- uses: "cachix/install-nix-action@v24"
88
with:
99
nix_path: "nixpkgs=channel:nixos-unstable"
10+
- uses: "cachix/cachix-action@v13"
11+
with:
12+
name: "hnix-store"
13+
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
1014
- uses: "actions/checkout@v4"
1115
with:
1216
submodules: recursive

0 commit comments

Comments
 (0)