From 0b15a9997ce231bc5a68dcf58e407daacac50a83 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Sat, 16 Oct 2021 14:52:38 -0700 Subject: [PATCH] github-runner: add aarch64-linux to platforms --- .../continuous-integration/github-runner/default.nix | 9 ++++++--- .../continuous-integration/github-runner/deps.nix | 10 ++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 8eb2ab61b487..d9d7cfd55442 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -29,7 +29,10 @@ let nugetSource = linkFarm "nuget-packages" nugetPackages; dotnetSdk = dotnetCorePackages.sdk_3_1; - runtimeId = "linux-x64"; + runtimeId = + if stdenv.isAarch64 + then "linux-arm64" + else "linux-x64"; fakeSha1 = "0000000000000000000000000000000000000000"; in stdenv.mkDerivation rec { @@ -271,7 +274,7 @@ stdenv.mkDerivation rec { description = "Self-hosted runner for GitHub Actions"; homepage = "https://github.com/actions/runner"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch ]; - platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ veehaitch newam ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/pkgs/development/tools/continuous-integration/github-runner/deps.nix index a0e9230517b6..803a4019a744 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -18,6 +18,11 @@ in version = "3.1.19"; sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; }) + (fetchNuGet { + name = "microsoft.aspnetcore.app.runtime.linux-arm64"; + version = "3.1.19"; + sha256 = "0xspb0xib1zsqnkkqm4s26z27v9idh9k09zziar1cavh2hxxxfcd"; + }) (fetchNuGet { name = "microsoft.aspnet.webapi.client"; version = "5.2.4"; @@ -43,6 +48,11 @@ in version = "3.1.19"; sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; }) + (fetchNuGet { + name = "microsoft.netcore.app.runtime.linux-arm64"; + version = "3.1.19"; + sha256 = "0v9nc38bg4k2qk547pl1rlrslwprixqlbhcbbf6pw1ia6261wm5m"; + }) (fetchNuGet { name = "microsoft.netcore.platforms"; version = "1.0.1";