Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@ jobs:
# run: nix run .#lint-${{ matrix.linter }}

build:
runs-on: ubuntu-latest
strategy:
matrix:
package:
- nix-snapshotter
- image-hello
- image-redis
- image-redisWithShell
runs-on:
- ubuntu-latest
- ubuntu-24.04-arm
runs-on: "${{ matrix.runs-on }}"
steps:
- uses: actions/checkout@v4
- name: Setup Nix
Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

outputs = inputs@{ nixpkgs, flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } {
systems = [ "x86_64-linux" ];
systems = [ "x86_64-linux" "aarch64-linux" ];
imports = [ ./modules ];
};
}
10 changes: 6 additions & 4 deletions modules/nixos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@ in {
```
*/
flake.nixosConfigurations = {
vm = nixosSystemFor "x86_64-linux" ./vm.nix;
vm-rootless = nixosSystemFor "x86_64-linux" ./vm-rootless.nix;
vm-x86_64-linux = nixosSystemFor "x86_64-linux" ./vm.nix;
Copy link
Collaborator

@elpdt852 elpdt852 Jun 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should do something like x86_64-linux.vm.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I think this is nicer, otherwise I think this is ready to merge!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bump for @yu-re-ka, sorry if you've already seen this. Not sure if GitHub automatically notifies for comments.

vm-rootless-x86_64-linux = nixosSystemFor "x86_64-linux" ./vm-rootless.nix;
vm-aarch64-linux = nixosSystemFor "aarch64-linux" ./vm.nix;
vm-rootless-aarch64-linux = nixosSystemFor "aarch64-linux" ./vm-rootless.nix;
};

perSystem = { system, ... }: {
Expand All @@ -77,8 +79,8 @@ in {
```
*/
apps = {
vm = vmApp "vm";
vm-rootless = vmApp "vm-rootless";
vm = vmApp "vm-${system}";
vm-rootless = vmApp "vm-rootless-${system}";
};

# NixOS tests for nix-snapshotter.
Expand Down