Skip to content

Commit 4cfb0bb

Browse files
Harmonize GHA workflows a little, add nix-bincache.rory.gay to trusted list to make github go brr
1 parent aa926a5 commit 4cfb0bb

5 files changed

Lines changed: 29 additions & 9 deletions

File tree

.github/workflows/build-docker.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ jobs:
2626
- uses: actions/checkout@v6
2727
- uses: cachix/install-nix-action@v31
2828
with:
29-
nix_path: nixpkgs=channel:nixos-unstable
29+
extra_nix_config: |
30+
system-features = nixos-test benchmark big-parallel kvm
31+
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-bincache.rory.gay:663PIW8xxgIImxLcsokODWI2PHFWXvzJEfjX6TaIjxQ=
32+
trusted-substituters = https://cache.nixos.org https://nix-bincache.rory.gay
33+
3034
- name: Build the docker image
3135
run: nix build .#containers.x86_64-linux.docker.${{ matrix.package }}
3236
- run: docker load < result

.github/workflows/dependabot-nix-update.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@ jobs:
1414
contents: write
1515
steps:
1616
- name: Check Out Code
17-
uses: actions/checkout@v5
17+
uses: actions/checkout@v6
1818

1919
- name: Install Nix
20-
uses: DeterminateSystems/nix-installer-action@main
20+
uses: cachix/install-nix-action@v31
21+
with:
22+
extra_nix_config: |
23+
system-features = nixos-test benchmark big-parallel kvm
24+
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-bincache.rory.gay:663PIW8xxgIImxLcsokODWI2PHFWXvzJEfjX6TaIjxQ=
25+
trusted-substituters = https://cache.nixos.org https://nix-bincache.rory.gay
2126
2227
- name: Update Nix Flake
2328
run: nix flake update --extra-experimental-features 'nix-command flakes'

.github/workflows/nix-build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
- uses: cachix/install-nix-action@v31
1414
with:
15-
nix_path: nixpkgs=channel:nixos-unstable
16-
#- uses: DeterminateSystems/magic-nix-cache-action@v13
15+
extra_nix_config: |
16+
system-features = nixos-test benchmark big-parallel kvm
17+
trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nix-bincache.rory.gay:663PIW8xxgIImxLcsokODWI2PHFWXvzJEfjX6TaIjxQ=
18+
trusted-substituters = https://cache.nixos.org https://nix-bincache.rory.gay
19+
1720
- run: nix build -L -j auto
1821
- run: nix develop --command echo OK
1922
- run: nix flake check -vL -j auto

.github/workflows/style.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ on:
88

99
jobs:
1010
build:
11-
1211
runs-on: ubuntu-latest
1312

1413
strategy:
@@ -17,7 +16,7 @@ jobs:
1716
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
1817

1918
steps:
20-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2120
- name: Use Node.js ${{ matrix.node-version }}
2221
uses: actions/setup-node@v5
2322
with:

flake.nix

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
{
22
description = "Spacebar server, written in Typescript.";
33

4+
nixConfig = {
5+
extra-substituters = [
6+
"https://nix-bincache.rory.gay"
7+
];
8+
extra-trusted-public-keys = [
9+
"nix-bincache.rory.gay:663PIW8xxgIImxLcsokODWI2PHFWXvzJEfjX6TaIjxQ="
10+
];
11+
};
12+
413
inputs = {
514
nixpkgs.url = "github:NixOS/nixpkgs/master"; # temp hack because unstable is frozen
615
flake-utils.url = "github:numtide/flake-utils";
@@ -125,4 +134,4 @@
125134
inherit self nixpkgs flake-utils;
126135
}
127136
);
128-
}
137+
}

0 commit comments

Comments
 (0)