Merge pull request #167 from DarkKirb/prepare-per-system-optim

Add gccarch settings for arm64
This commit is contained in:
Charlotte 🦝 Delenk 2023-02-08 17:50:48 +01:00 committed by GitHub
commit 4c6cf44b51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions

View file

@ -85,6 +85,16 @@
}; };
nix.settings.cores = 2; nix.settings.cores = 2;
nix.settings.max-jobs = 2; nix.settings.max-jobs = 2;
nix.settings.system-features = [
"nixos-test"
"big-parallel"
"benchmark"
"gccarch-armv8-a"
"gccarch-armv8.1-a"
"gccarch-armv8.2-a"
"gccarch-skylake"
"ca-derivations"
];
nix.daemonCPUSchedPolicy = "idle"; nix.daemonCPUSchedPolicy = "idle";
nix.daemonIOSchedClass = "idle"; nix.daemonIOSchedClass = "idle";

View file

@ -94,7 +94,7 @@ in {
]; ];
maxJobs = 2; maxJobs = 2;
speedFactor = 1; speedFactor = 1;
supportedFeatures = ["nixos-test" "benchmark" "ca-derivations"]; supportedFeatures = ["nixos-test" "benchmark" "ca-derivations" "gccarch-armv8-a" "gccarch-armv8.1-a" "gccarch-armv8.2-a"];
} }
]; ];
distributedBuilds = true; distributedBuilds = true;

View file

@ -9,7 +9,7 @@
clean-cache = nix-packages.packages.${system}.clean-s3-cache; clean-cache = nix-packages.packages.${system}.clean-s3-cache;
machines = pkgs.writeText "machines" '' machines = pkgs.writeText "machines" ''
localhost armv7l-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,riscv32-linux,riscv64-linux,wasm32-wasi,x86_64-linux,i686-linux - 12 1 kvm,nixos-test,big-parallel,benchmark,gccarch-znver1,gccarch-skylake,ca-derivations - localhost armv7l-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,riscv32-linux,riscv64-linux,wasm32-wasi,x86_64-linux,i686-linux - 12 1 kvm,nixos-test,big-parallel,benchmark,gccarch-znver1,gccarch-skylake,ca-derivations -
build-aarch64 aarch64-linux - 2 1 nixos-test,benchmark,ca-derivations - build-aarch64 aarch64-linux - 2 1 nixos-test,benchmark,ca-derivations,gccarch-armv8-a,gccarch-armv8.1-a,gccarch-armv8.2-a -
''; '';
sshConfig = pkgs.writeText "ssh-config" '' sshConfig = pkgs.writeText "ssh-config" ''
Host build-aarch64 Host build-aarch64