Skip to content

Commit 1fd1d11

Browse files
committed
ci: nuke install libsodium-dev step
1 parent 3710c6a commit 1fd1d11

File tree

3 files changed

+2
-35
lines changed

3 files changed

+2
-35
lines changed

.github/workflows/ci.dhall

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,7 @@ let haskellCi =
44
let defSteps = haskellCi.defaultCabalSteps
55

66
in haskellCi.generalCi
7-
( haskellCi.withNix
8-
( defSteps
9-
with extraSteps.pre
10-
=
11-
defSteps.extraSteps.pre
12-
# [ haskellCi.installCachixStep "hnix-store"
13-
, haskellCi.BuildStep.NameIf
14-
{ name = "Install libsodium"
15-
, run = "sudo apt install libsodium-dev"
16-
, `if` = "matrix.os == 'ubuntu-latest'"
17-
}
18-
]
19-
)
20-
)
7+
(haskellCi.withNix defSteps)
218
haskellCi.DhallMatrix::{
229
, ghc =
2310
[ haskellCi.GHC.GHC963

.github/workflows/ci.dhall.frozen

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,7 @@ let haskellCi =
55
let defSteps = haskellCi.defaultCabalSteps
66

77
in haskellCi.generalCi
8-
( haskellCi.withNix
9-
( defSteps
10-
with extraSteps.pre
11-
=
12-
defSteps.extraSteps.pre
13-
# [ haskellCi.installCachixStep "hnix-store"
14-
, haskellCi.BuildStep.NameIf
15-
{ name = "Install libsodium"
16-
, run = "sudo apt install libsodium-dev"
17-
, `if` = "matrix.os == 'ubuntu-latest'"
18-
}
19-
]
20-
)
21-
)
8+
(haskellCi.withNix defSteps)
229
haskellCi.DhallMatrix::{
2310
, ghc =
2411
[ haskellCi.GHC.GHC963

.github/workflows/ci.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@ jobs:
77
- uses: "cachix/install-nix-action@v23"
88
with:
99
nix_path: "nixpkgs=channel:nixos-unstable"
10-
- uses: "cachix/cachix-action@v12"
11-
with:
12-
name: "hnix-store"
13-
signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
14-
- if: "matrix.os == 'ubuntu-latest'"
15-
name: Install libsodium
16-
run: "sudo apt install libsodium-dev"
1710
- uses: "actions/checkout@v4"
1811
with:
1912
submodules: recursive

0 commit comments

Comments
 (0)