From d3b115b85449aa7bc6dedc5d3ba0f81ee2fe8296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 8 Apr 2023 11:31:26 +0100 Subject: [PATCH] update url --- hydra/jobsets.nix | 104 ++++++++++++++++++++++++---------------------- hydra/spec.json | 26 ++++++++++-- 2 files changed, 77 insertions(+), 53 deletions(-) diff --git a/hydra/jobsets.nix b/hydra/jobsets.nix index ef08d3c..3d34b90 100644 --- a/hydra/jobsets.nix +++ b/hydra/jobsets.nix @@ -7,43 +7,54 @@ systems = ["x86_64-linux" "aarch64-linux"]; nixpkgs_version = ["master"]; mkJobsets = system: version: - (pkgs.lib.mapAttrs' ( - num: info: { - name = "${system}-${version}-pr${num}"; + builtins.listToAttrs ( + map (info: + { + name = "${system}-${version}-pr${toString info.number}"; value = { enabled = 1; hidden = false; - description = "PR ${num} (${system}-${version}): ${info.title}"; + description = "PR ${toString info.number} (${system}-${version}): ${info.title}"; nixexprinput = "nix-packages"; nixexprpath = "hydra/default.nix"; - checkinterval = - if info.head.repo.owner.login == "darkkirb" && info.head.repo.name == "nix-packages" # Don’t need to manually check - then 0 - else 300; + checkinterval = 0; schedulingshares = 100; enableemail = false; emailoverride = ""; keepnr = 1; - inputs = { - nix-packages = { - type = "git"; - value = "https://github.com/${info.head.repo.owner.login}/${info.head.repo.name}.git ${info.head.ref}"; - emailresponsible = false; - }; - nixpkgs = { - type = "git"; - value = "https://github.com/NixOS/nixpkgs.git ${version}"; - emailresponsible = false; - }; - system = { - type = "string"; - value = system; - }; + nix-packages = { + type = "git"; + url = "${info.head.repo.clone_url} ${info.head.ref}"; + emailresponsible = false; + }; + nixpkgs = { + type = "git"; + value = "https://github.com/NixOS/nixpkgs.git ${version}"; + emailresponsible = false; + }; + system = { + type = "string"; + value = system; + }; + gitea_status_repo = { + type = "string"; + value = "nix-packages"; + emailresponsible = false; + }; + gitea_repo_owner = { + type = "string"; + value = "${info.head.repo.owner.login}"; + emailresponsible = false; + }; + gitea_repo_name = { + type = "string"; + value = "${info.head.repo.name}"; + emailresponsible = false; }; }; } - ) - prs) + prs) + ) // { "${system}-${version}" = { enabled = 1; @@ -59,7 +70,7 @@ inputs = { nix-packages = { type = "git"; - value = "https://github.com/DarkKirb/nix-packages.git main"; + value = "https://git.chir.rs/darkkirb/nix-packages main"; emailresponsible = false; }; nixpkgs = { @@ -71,33 +82,26 @@ type = "string"; value = system; }; - }; - }; - }; - - concatAttrs = pkgs.lib.foldr (a: b: a // b) {}; - - jobsets = - (concatAttrs (pkgs.lib.concatMap (system: map (version: mkJobsets system version) nixpkgs_version) systems)) - // { - nix-packages-flake = { - enabled = 1; - hidden = false; - description = "nix-packages flake"; - nixexprinput = "nix-packages"; - nixexprpath = "hydra/parse-flake.nix"; - checkinterval = 0; - schedulingshares = 100; - enableemail = false; - emailoverride = ""; - keepnr = 1; - inputs = { - flake = { - type = "git"; - value = "https://github.com/DarkKirb/nix-packages.git main"; + gitea_status_repo = { + type = "string"; + value = "nix-packages"; + emailresponsible = false; + }; + gitea_repo_owner = { + type = "string"; + value = "darkkirb"; + emailresponsible = false; + }; + gitea_repo_name = { + type = "string"; + value = "nixos-config"; emailresponsible = false; }; }; }; }; + concatAttrs = pkgs.lib.foldr (a: b: a // b) {}; + + jobsets = + concatAttrs (pkgs.lib.concatMap (system: map (version: mkJobsets system version) nixpkgs_version) systems); in {jobsets = pkgs.writeText "jobsets.json" (builtins.toJSON jobsets);} diff --git a/hydra/spec.json b/hydra/spec.json index 5131363..b6e841b 100644 --- a/hydra/spec.json +++ b/hydra/spec.json @@ -12,7 +12,7 @@ "inputs": { "nix-packages": { "type": "git", - "value": "https://github.com/DarkKirb/nix-packages.git main", + "value": "https://git.chir.rs/dark-kirb/nix-packages.git main", "emailresponsible": false }, "nixpkgs": { @@ -21,8 +21,28 @@ "emailresponsible": false }, "prsJSON": { - "type": "githubpulls", - "value": "DarkKirb nix-packages", + "type": "path", + "value": "https://git.chir.rs/api/v1/repos/darkkirb/nix-packages/pulls?state=open&sort=recentupdate", + "emailresponsible": false + }, + "gitea_status_repo": { + "type": "string", + "value": "nix-packages", + "emailresponsible": false + }, + "gitea_http_url": { + "type": "string", + "value": "https://git.chir.rs/", + "emailresponsible": false + }, + "gitea_repo_owner": { + "type": "string", + "value": "darkkirb", + "emailresponsible": false + }, + "gitea_repo_name": { + "type": "string", + "value": "nix-packages", "emailresponsible": false } }