ci: update, restore cachix step

This commit is contained in:
sorki 2023-11-29 15:08:47 +01:00
parent 134f1313af
commit f2f6541f15
3 changed files with 22 additions and 4 deletions

View File

@ -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

View File

@ -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

View File

@ -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