Skip to content

Commit cce060c

Browse files
committed
use cachix
1 parent 0e6246d commit cce060c

File tree

6 files changed

+35
-10
lines changed

6 files changed

+35
-10
lines changed

.github/workflows/flake-check.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,14 @@
2121
}
2222
},
2323
{
24-
"uses": "DeterminateSystems/nix-installer-action@main"
24+
"uses": "cachix/install-nix-action@v38"
2525
},
2626
{
27-
"uses": "DeterminateSystems/magic-nix-cache-action@main"
27+
"uses": "cachix/cachix-action@v16",
28+
"with": {
29+
"authToken": "${{secrets.CACHIX_AUTH_TOKEN}}",
30+
"name": "dendrix"
31+
}
2832
},
2933
{
3034
"id": "check",

.github/workflows/gh-pages.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,14 @@
2121
}
2222
},
2323
{
24-
"uses": "DeterminateSystems/nix-installer-action@main"
24+
"uses": "cachix/install-nix-action@v38"
2525
},
2626
{
27-
"uses": "DeterminateSystems/magic-nix-cache-action@main"
27+
"uses": "cachix/cachix-action@v16",
28+
"with": {
29+
"authToken": "${{secrets.CACHIX_AUTH_TOKEN}}",
30+
"name": "dendrix"
31+
}
2832
},
2933
{
3034
"name": "flake check",

.github/workflows/update-sources.yaml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,17 @@
2121
}
2222
},
2323
{
24-
"uses": "DeterminateSystems/nix-installer-action@main"
24+
"uses": "cachix/install-nix-action@v38"
2525
},
2626
{
27-
"uses": "DeterminateSystems/magic-nix-cache-action@main"
27+
"uses": "cachix/cachix-action@v16",
28+
"with": {
29+
"authToken": "${{secrets.CACHIX_AUTH_TOKEN}}",
30+
"name": "dendrix"
31+
}
2832
},
2933
{
30-
"run": "set -e\nnix develop --accept-flake-config --override-input dendrix . --print-build-logs ./dev -c pins update\nrm -rf ./dev/community/discovered/\necho '{}' > ./dev/community/discovered/trees.json\necho '{ dendrix.discover-community-aspects = true; }' > ./dev/modules/enable-discovery.nix\nnix develop --accept-flake-config --override-input dendrix . --print-build-logs ./dev -c files\nrm ./dev/modules/enable-discovery.nix\nnix flake --accept-flake-config check path:dev --override-input dendrix . --print-build-logs\n"
34+
"run": "set -e\nnix develop --accept-flake-config --override-input dendrix . --print-build-logs ./dev -c pins update\nrm -rf ./dev/community/discovered/\necho '{ dendrix.discover-community-aspects = true; }' > ./dev/modules/enable-discovery.nix\nnix develop --accept-flake-config --override-input dendrix . --print-build-logs ./dev -c files\nrm ./dev/modules/enable-discovery.nix\nnix flake --accept-flake-config check path:dev --override-input dendrix . --print-build-logs\n"
3135
},
3236
{
3337
"id": "update",

dev/flake.nix

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
{
22
outputs = inputs: import ./. inputs;
3+
4+
nixConfig = {
5+
extra-trusted-public-keys = [
6+
"dendrix.cachix.org-1:OdDiPPnm0gukv156krv4p5ZWWcCpIxnlnAFvSqX1H3c="
7+
];
8+
extra-substituters = [ "https://dendrix.cachix.org" ];
9+
};
10+
311
inputs = {
412
dendrix.flake = false;
513
dendrix.url = "path:..";

dev/modules/_gh-provision-nix.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66
hatchet-protocol = "holster";
77
};
88
}
9-
{ uses = "DeterminateSystems/nix-installer-action@main"; }
10-
{ uses = "DeterminateSystems/magic-nix-cache-action@main"; }
9+
{ uses = "cachix/install-nix-action@v38"; }
10+
{
11+
uses = "cachix/cachix-action@v16";
12+
"with" = {
13+
name = "dendrix";
14+
authToken = "\${{secrets.CACHIX_AUTH_TOKEN}}";
15+
};
16+
}
1117
]

dev/modules/gh-update-sources.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ in
4040
set -e
4141
nix develop --accept-flake-config --override-input dendrix . --print-build-logs ./dev -c pins update
4242
rm -rf ./dev/community/discovered/
43-
echo '{}' > ./dev/community/discovered/trees.json
4443
echo '{ dendrix.discover-community-aspects = true; }' > ./dev/modules/enable-discovery.nix
4544
nix develop --accept-flake-config --override-input dendrix . --print-build-logs ./dev -c files
4645
rm ./dev/modules/enable-discovery.nix

0 commit comments

Comments
 (0)