mirror of
https://github.com/haskell-nix/hnix-store.git
synced 2024-09-11 18:05:56 +03:00
ci: nuke install libsodium-dev step
This commit is contained in:
parent
3710c6a445
commit
1fd1d1118b
15
.github/workflows/ci.dhall
vendored
15
.github/workflows/ci.dhall
vendored
@ -4,20 +4,7 @@ let haskellCi =
|
||||
let defSteps = haskellCi.defaultCabalSteps
|
||||
|
||||
in haskellCi.generalCi
|
||||
( haskellCi.withNix
|
||||
( defSteps
|
||||
with extraSteps.pre
|
||||
=
|
||||
defSteps.extraSteps.pre
|
||||
# [ haskellCi.installCachixStep "hnix-store"
|
||||
, haskellCi.BuildStep.NameIf
|
||||
{ name = "Install libsodium"
|
||||
, run = "sudo apt install libsodium-dev"
|
||||
, `if` = "matrix.os == 'ubuntu-latest'"
|
||||
}
|
||||
]
|
||||
)
|
||||
)
|
||||
(haskellCi.withNix defSteps)
|
||||
haskellCi.DhallMatrix::{
|
||||
, ghc =
|
||||
[ haskellCi.GHC.GHC963
|
||||
|
15
.github/workflows/ci.dhall.frozen
vendored
15
.github/workflows/ci.dhall.frozen
vendored
@ -5,20 +5,7 @@ let haskellCi =
|
||||
let defSteps = haskellCi.defaultCabalSteps
|
||||
|
||||
in haskellCi.generalCi
|
||||
( haskellCi.withNix
|
||||
( defSteps
|
||||
with extraSteps.pre
|
||||
=
|
||||
defSteps.extraSteps.pre
|
||||
# [ haskellCi.installCachixStep "hnix-store"
|
||||
, haskellCi.BuildStep.NameIf
|
||||
{ name = "Install libsodium"
|
||||
, run = "sudo apt install libsodium-dev"
|
||||
, `if` = "matrix.os == 'ubuntu-latest'"
|
||||
}
|
||||
]
|
||||
)
|
||||
)
|
||||
(haskellCi.withNix defSteps)
|
||||
haskellCi.DhallMatrix::{
|
||||
, ghc =
|
||||
[ haskellCi.GHC.GHC963
|
||||
|
7
.github/workflows/ci.yaml
vendored
7
.github/workflows/ci.yaml
vendored
@ -7,13 +7,6 @@ jobs:
|
||||
- uses: "cachix/install-nix-action@v23"
|
||||
with:
|
||||
nix_path: "nixpkgs=channel:nixos-unstable"
|
||||
- uses: "cachix/cachix-action@v12"
|
||||
with:
|
||||
name: "hnix-store"
|
||||
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
|
||||
- if: "matrix.os == 'ubuntu-latest'"
|
||||
name: Install libsodium
|
||||
run: "sudo apt install libsodium-dev"
|
||||
- uses: "actions/checkout@v4"
|
||||
with:
|
||||
submodules: recursive
|
||||
|
Loading…
Reference in New Issue
Block a user