just use normal hydra the nix-ca one barely works

This commit is contained in:
Charlotte 🦝 Delenk 2022-05-01 20:11:01 +01:00
parent 289c484842
commit 5bca1d2b56
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
3 changed files with 35 additions and 32 deletions

View file

@ -1,16 +1,3 @@
diff --git a/src/hydra-eval-jobs/hydra-eval-jobs.cc b/src/hydra-eval-jobs/hydra-eval-jobs.cc
index d98ad88d..6830567c 100644
--- a/src/hydra-eval-jobs/hydra-eval-jobs.cc
+++ b/src/hydra-eval-jobs/hydra-eval-jobs.cc
@@ -289,7 +289,7 @@ int main(int argc, char * * argv)
/* Prevent access to paths outside of the Nix search path and
to the environment. */
- evalSettings.restrictEval = true;
+ //evalSettings.restrictEval = true;
/* When building a flake, use pure evaluation (no access to
'getEnv', 'currentSystem' etc. */
diff --git a/src/hydra-queue-runner/build-remote.cc b/src/hydra-queue-runner/build-remote.cc
index e7495f33..cbd6f18e 100644
--- a/src/hydra-queue-runner/build-remote.cc
@ -31,7 +18,7 @@ index e7495f33..cbd6f18e 100644
+ } catch (Error & e) {
+ printError(e.msg());
+ }
// Also register the unresolved one
auto unresolvedRealisation = realisation;
unresolvedRealisation.signatures.clear();
@ -50,14 +37,14 @@ index e7495f33..cbd6f18e 100644
+ }
}
}
diff --git a/src/lib/Hydra/Plugin/GiteaStatus.pm b/src/lib/Hydra/Plugin/GiteaStatus.pm
index 426c93f5..c246fa2a 100644
index 426c93f5..9fe83c2a 100644
--- a/src/lib/Hydra/Plugin/GiteaStatus.pm
+++ b/src/lib/Hydra/Plugin/GiteaStatus.pm
@@ -52,34 +52,51 @@ sub common {
});
while (my $eval = $evals->next) {
- my $giteastatusInput = $eval->jobsetevalinputs->find({ name => "gitea_status_repo" });
- next unless defined $giteastatusInput && defined $giteastatusInput->value;
@ -121,7 +108,7 @@ index 426c93f5..c246fa2a 100644
+ }
+
+ $sendStatus->($giteastatusInput, $host, $repoOwner, $repoName, $rev);
- print STDERR "GiteaStatus POSTing $state to $url\n";
- my $req = HTTP::Request->new('POST', $url);
- $req->header('Content-Type' => 'application/json');
@ -139,7 +126,7 @@ index 05a35ca2..251a042a 100644
+++ b/src/lib/Hydra/Plugin/GithubStatus.pm
@@ -26,7 +26,7 @@ sub toGithubState {
}
sub common {
- my ($self, $topbuild, $dependents, $finished) = @_;
+ my ($self, $topbuild, $dependents, $finished, $publish) = @_;
@ -173,7 +160,7 @@ index 05a35ca2..251a042a 100644
+ }
+ }
};
if (defined $eval->flake) {
my $fl = $eval->flake;
print STDERR "Flake is $fl\n";

View file

@ -178,6 +178,7 @@
},
"hydra": {
"inputs": {
"newNixpkgs": "newNixpkgs",
"nix": [
"nix"
],
@ -187,16 +188,15 @@
]
},
"locked": {
"lastModified": 1642687475,
"narHash": "sha256-jdzUBckbpckHVcllLxi5fIGD0ANmUR22mAKPmgiNcoY=",
"owner": "thufschmitt",
"lastModified": 1650377387,
"narHash": "sha256-3fVFViUzr1Kv8+N38lblXA8S4hHrRcA9GaFH/NemKGM=",
"owner": "NixOS",
"repo": "hydra",
"rev": "cdff8067285336abbe4750ae15d0a7dcdda5fcb5",
"rev": "5c90edd19f1787141ae3d9751f567b4df11fc0fa",
"type": "github"
},
"original": {
"owner": "thufschmitt",
"ref": "nix-ca",
"owner": "NixOS",
"repo": "hydra",
"type": "github"
}
@ -249,6 +249,22 @@
"url": "https://git.chir.rs/CarolineHusky/MiiFox.net"
}
},
"newNixpkgs": {
"locked": {
"lastModified": 1651114127,
"narHash": "sha256-/lLC0wkMZkAdA5e1W76SnJzbhfOGDvync3VRHJMtAKk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6766fb6503ae1ebebc2a9704c162b2aef351f921",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable-small",
"repo": "nixpkgs",
"type": "github"
}
},
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
@ -256,16 +272,16 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1645099657,
"narHash": "sha256-E9iQ7f+9Z6xFcUvvfksTEfn8LsDfzmwrcRBC//5B3V0=",
"lastModified": 1646680282,
"narHash": "sha256-m8tqCS6uHveDon5GSro5yZor9H+sHeh+v/veF1IGw24=",
"owner": "NixOS",
"repo": "nix",
"rev": "e044ccb67ce38d11059de32515306f5f1bd2f04f",
"rev": "ffe155abd36366a870482625543f9bf924a58281",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "2.6.1",
"ref": "2.7.0",
"repo": "nix",
"type": "github"
}

View file

@ -14,8 +14,8 @@ rec {
polymc.url = "github:PolyMC/PolyMC";
polymc.inputs.nixpkgs.follows = "nixpkgs";
dns.url = "github:DarkKirb/dns.nix?ref=master";
hydra.url = github:thufschmitt/hydra/nix-ca;
nix.url = github:NixOS/nix/2.6.1;
hydra.url = github:NixOS/hydra;
nix.url = github:NixOS/nix/2.7.0;
hydra.inputs.nix.follows = "nix";
hydra.inputs.nixpkgs.follows = "nix/nixpkgs";
hosts-list.url = github:StevenBlack/hosts;