Skip to content

Commit 8b61ad4

Browse files
committed
chores: use custom github runners
n.b. the runners should already have Nix installed
1 parent eaefc20 commit 8b61ad4

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

.github/workflows/nix-build.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,6 @@ jobs:
7171
/nix/var/nix/profiles/default/bin/nix copy --to 's3://nix-postgres-artifacts?secret-key=/etc/nix/nix-secret-key' $OUT_PATHS
7272
EOF
7373
sudo chmod +x /etc/nix/upload-to-cache.sh
74-
- name: Install nix
75-
uses: cachix/install-nix-action@v27
76-
if: ${{ github.secret_source == 'Actions' }}
77-
with:
78-
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
79-
extra_nix_config: |
80-
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
81-
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
82-
post-build-hook = /etc/nix/upload-to-cache.sh
83-
- name: Install nix
84-
uses: cachix/install-nix-action@v27
85-
if: ${{ github.secret_source == 'None' }}
86-
with:
87-
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
88-
extra_nix_config: |
89-
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
90-
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
9174
- name: Aggressive disk cleanup for DuckDB build
9275
if: matrix.runner == 'macos-latest-xlarge'
9376
run: |

nix/github-actions.nix

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
{ inputs, ... }:
2+
let
3+
githubPlatforms = {
4+
"x86_64-linux" = "large-linux-x86";
5+
"aarch64-linux" = "large-linux-arm";
6+
"aarch64-darwin" = "macos-latest-xlarge";
7+
};
8+
in
29
{
310
flake.githubActions = inputs.nix-github-actions.lib.mkGithubMatrix {
4-
checks = inputs.nixpkgs.lib.getAttrs [ "x86_64-linux" ] inputs.self.checks;
11+
checks = inputs.nixpkgs.lib.getAttrs [
12+
"x86_64-linux"
13+
"aarch64-linux"
14+
"aarch64-darwin"
15+
] inputs.self.checks;
16+
platforms = githubPlatforms;
517
};
618
}

0 commit comments

Comments
 (0)