darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions
nixos-config/extra/hydra.patch

194 lines
9.2 KiB
Diff
Raw Blame History

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
+++ b/src/hydra-queue-runner/build-remote.cc
@@ -532,15 +532,31 @@ void State::buildRemote(ref<Store> destStore,
auto outputHashes = staticOutputHashes(*localStore, *step->drv);
for (auto & [outputId, realisation] : builtOutputs) {
// Register the resolved drv output
- localStore->registerDrvOutput(realisation);
- destStore->registerDrvOutput(realisation);
+ try {
+ localStore->registerDrvOutput(realisation);
+ } catch (Error & e) {
+ printError(e.msg());
+ }
+ try {
+ destStore->registerDrvOutput(realisation);
+ } catch (Error & e) {
+ printError(e.msg());
+ }
// Also register the unresolved one
auto unresolvedRealisation = realisation;
unresolvedRealisation.signatures.clear();
unresolvedRealisation.id.drvHash = outputHashes.at(outputId.outputName);
- localStore->registerDrvOutput(unresolvedRealisation);
- destStore->registerDrvOutput(unresolvedRealisation);
+ try {
+ localStore->registerDrvOutput(unresolvedRealisation);
+ } catch (Error & e) {
+ printError(e.msg());
+ }
+ try {
+ destStore->registerDrvOutput(unresolvedRealisation);
+ } catch (Error & e) {
+ printError(e.msg());
+ }
}
}
diff --git a/src/lib/Hydra/Plugin/GiteaStatus.pm b/src/lib/Hydra/Plugin/GiteaStatus.pm
index 426c93f5..c246fa2a 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;
- my $i = $eval->jobsetevalinputs->find({ name => $giteastatusInput->value, altnr => 0 });
- next unless defined $i;
- my $gitea_url = $eval->jobsetevalinputs->find({ name => "gitea_http_url" });
-
- my $repoOwner = $eval->jobsetevalinputs->find({ name => "gitea_repo_owner" })->value;
- my $repoName = $eval->jobsetevalinputs->find({ name => "gitea_repo_name" })->value;
- my $accessToken = $self->{config}->{gitea_authorization}->{$repoOwner};
-
- my $rev = $i->revision;
- my $domain = URI->new($i->uri)->host;
- my $host;
- unless (defined $gitea_url) {
- $host = "https://$domain";
+ my $sendStatus = sub {
+ my ($input, $host, $owner, $repo, $rev) = @_;
+
+ my $accessToken = $self->{config}->{gitea_authorization}->{$owner};
+ my $url = "$host/api/v1/repos/$owner/$repo/statuses/$rev";
+
+ print STDERR "GiteaStatus POSTing $state to $url\n";
+ my $req = HTTP::Request->new('POST', $url);
+ $req->header('Content-Type' => 'application/json');
+ $req->header('Authorization' => "token $accessToken");
+ $req->content($body);
+ my $res = $ua->request($req);
+ print STDERR $res->status_line, ": ", $res->decoded_content, "\n" unless $res->is_success;
+
+ };
+ if (defined $eval->flake) {
+ my $fl = $eval->flake;
+ print STDERR "Flake is $fl\n";
+ if ($eval->flake =~ m!git\+https://git\.chir\.rs/([^/]+)/([^/]+)\?.*rev=([[:xdigit:]]{40})$!) {
+ $sendStatus->("src", "https://git.chir.rs", $1, $2, $3);
+ } else {
+ print STDERR "Can't parse flake, skipping Gitea status update\n";
+ }
} else {
- $host = $gitea_url->value;
- }
-
- my $url = "$host/api/v1/repos/$repoOwner/$repoName/statuses/$rev";
+ my $giteastatusInput = $eval->jobsetevalinputs->find({ name => "gitea_status_repo" });
+ next unless defined $giteastatusInput && defined $giteastatusInput->value;
+ my $i = $eval->jobsetevalinputs->find({ name => $giteastatusInput->value, altnr => 0 });
+ next unless defined $i;
+ my $gitea_url = $eval->jobsetevalinputs->find({ name => "gitea_http_url" });
+
+ my $repoOwner = $eval->jobsetevalinputs->find({ name => "gitea_repo_owner" })->value;
+ my $repoName = $eval->jobsetevalinputs->find({ name => "gitea_repo_name" })->value;
+
+ my $rev = $i->revision;
+ my $domain = URI->new($i->uri)->host;
+ my $host;
+ unless (defined $gitea_url) {
+ $host = "https://$domain";
+ } else {
+ $host = $gitea_url->value;
+ }
+
+ $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');
- $req->header('Authorization' => "token $accessToken");
- $req->content($body);
- my $res = $ua->request($req);
- print STDERR $res->status_line, ": ", $res->decoded_content, "\n" unless $res->is_success;
+ }
}
}
}
diff --git a/src/lib/Hydra/Plugin/GithubStatus.pm b/src/lib/Hydra/Plugin/GithubStatus.pm
index 05a35ca2..251a042a 100644
--- a/src/lib/Hydra/Plugin/GithubStatus.pm
+++ 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) = @_;
my $cfg = $self->{config}->{githubstatus};
my @config = defined $cfg ? ref $cfg eq "ARRAY" ? @$cfg : ($cfg) : ();
my $baseurl = $self->{config}->{'base_uri'} || "http://localhost:3000";
@@ -89,13 +89,35 @@ sub common {
} else {
print STDERR "GithubStatus ratelimit $limitRemaining/$limit, resets in $diff\n";
}
+
+ if ($finished and ($build->buildstatus == 0)) {
+ # Try to start the deployment
+ my $body = encode_json({
+ ref => "main", # Whatever
+ inputs => {
+ job_name => $jobName,
+ rev => $rev
+ }
+ });
+ my $url = "https://api.github.com/repos/$owner/$repo/actions/workflows/deploy.yml/dispatches";
+ my $req = HTTP::Request->new('POST', $url);
+ $req->header('Content-Type' => 'application/json');
+ $req->header('Accept' => 'application/vnd.github.v3+json');
+ $req->header('Authorization' => ($self->{config}->{github_authorization}->{$owner} // $conf->{authorization}));
+ $req->content($body);
+ my $res = $ua->request($req);
+ print STDERR $res->status_line, ": ", $res->decoded_content, "\n" unless $res->is_success;
+ if ($limitRemaining < 2000) {
+ sleep $delay;
+ }
+ }
};
if (defined $eval->flake) {
my $fl = $eval->flake;
print STDERR "Flake is $fl\n";
if ($eval->flake =~ m!github:([^/]+)/([^/]+)/([[:xdigit:]]{40})$! or $eval->flake =~ m!git\+ssh://git\@github.com/([^/]+)/([^/]+)\?.*rev=([[:xdigit:]]{40})$!) {
- $sendStatus->("src", $1, $2, $3);
+ $sendStatus->("src", $1, $2, $3, 1);
} else {
print STDERR "Can't parse flake, skipping GitHub status update\n";
}
@@ -109,7 +131,7 @@ sub common {
my $uri = $i->uri;
my $rev = $i->revision;
$uri =~ m![:/]([^/]+)/([^/]+?)(?:.git)?$!;
- $sendStatus->($input, $1, $2, $rev);
+ $sendStatus->($input, $1, $2, $rev, 0);
}
}
}
Reference in a new issue View git blame Copy permalink