vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Merge pull request #1000 from DeterminateSystems/fixup/pr-998'

Browse source 
#998: Batch of fixups
This commit is contained in:
Graham Christensen 2021-08-16 16:18:24 -04:00 committed by GitHub
parent fda3ed1d4e 6e65c3b320
commit ff7ecf50d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -554,7 +554,7 @@
su - hydra -c "hydra-create-user root --email-address 'alice@example.org' --password foobar --role admin" su - hydra -c "hydra-create-user root --email-address 'alice@example.org' --password foobar --role admin"
mkdir /run/jobset mkdir /run/jobset
chmod 755 /run/jobset chmod 755 /run/jobset
cp ${./t/api-test.nix} /run/jobset/default.nix cp ${./t/jobs/api-test.nix} /run/jobset/default.nix
chmod 644 /run/jobset/default.nix chmod 644 /run/jobset/default.nix
chown -R hydra /run/jobset chown -R hydra /run/jobset
""" """

7
src/script/hydra-notify
View file

@ -2,12 +2,13 @@
use strict; use strict;
use utf8; use utf8;
use Getopt::Long;
use Hydra::Event;
use Hydra::Event::BuildFinished; use Hydra::Event::BuildFinished;
use Hydra::Helper::AddBuilds; use Hydra::Helper::AddBuilds;
use Hydra::Helper::Nix; use Hydra::Helper::Nix;
use Hydra::Plugin; use Hydra::Plugin;
use Hydra::PostgresListener; use Hydra::PostgresListener;
use Getopt::Long;
STDERR->autoflush(1); STDERR->autoflush(1);
STDOUT->autoflush(1); STDOUT->autoflush(1);
@ -49,7 +50,7 @@ sub runPluginsForEvent {
for my $build ($db->resultset('Builds')->search( for my $build ($db->resultset('Builds')->search(
{ notificationpendingsince => { '!=', undef } })) { notificationpendingsince => { '!=', undef } }))
{ {
print STDERR "sending notifications for build $build->id...\n"; print STDERR "sending notifications for build ${\$build->id}...\n";
my $event = Hydra::Event::BuildFinished->new($build->id); my $event = Hydra::Event::BuildFinished->new($build->id);
@ -67,7 +68,7 @@ while (!$queued_only) {
my $payload = $message->{"payload"}; my $payload = $message->{"payload"};
eval { eval {
my $event = Hydra::Event::new_event($channelName, $message->{"payload"}); my $event = Hydra::Event->new_event($channelName, $message->{"payload"});
runPluginsForEvent($event); runPluginsForEvent($event);
1; 1;