From c7984ffdac5fef8712102d2f1bb0c96b891ca065 Mon Sep 17 00:00:00 2001 From: David Brown Date: Fri, 1 Jul 2016 15:32:18 +0100 Subject: [PATCH] Build machine to pick up latest buildall.pl every time. --- src/tools/make/buildall.pl | 15 ++++++++------- src/tools/make/postpush.pl | 7 ++++--- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/tools/make/buildall.pl b/src/tools/make/buildall.pl index 49b90800..7ac0a819 100755 --- a/src/tools/make/buildall.pl +++ b/src/tools/make/buildall.pl @@ -42,6 +42,7 @@ sub logged { } +unlink glob "log/*"; for my $machine (sort keys %machines) { my ($login, $sudo, $dir) = @{$machines{$machine}}; @@ -53,7 +54,7 @@ while ((my $pid = wait) > 0) {print "Child pid $pid completed.\n";} # # All builds have completed. Now scan the logs for pass/fail and build the passing report. -# +# # my %status = (); # open(my $logs, "/tmp/buildall.log") // die "Couldn't open combined build log."; # while (<$logs>) { @@ -62,23 +63,23 @@ while ((my $pid = wait) > 0) {print "Child pid $pid completed.\n";} # } # } # close(my $logs); -# -# +# +# # sub svgtext { # my ($f, $x, $y, $msg) = @_; # print($f ""; # print($f $msg); # print($f "\n"); # } -# -# +# +# # open(my $svg, ">passing.svg") // dir "Could not create passing.svg."); # print $svg '\n'; -# +# # my $i=1; # for my $host (sort keys %status) { # svgtext($svg, 10, $i*20, $host); # $i++; # } -# +# # print $svg '\n'; diff --git a/src/tools/make/postpush.pl b/src/tools/make/postpush.pl index 4db1e46b..94a4394b 100755 --- a/src/tools/make/postpush.pl +++ b/src/tools/make/postpush.pl @@ -11,7 +11,7 @@ use JSON; sub writelog { my ($msg) = @_; - + open(LOG, ">>/tmp/postpush.log") or die "Could not create postpush.log"; flock(LOG, 2) or die "Could not lock postpush.log"; print LOG sprintf("%s %s\n", strftime("%Y/%m/%d %H.%M.%S", localtime), $msg); @@ -40,9 +40,10 @@ if ($child) { } else { # child process close(STDIN); close(STDOUT); close(STDERR); - exec 'perl /var/lib/nethserver/ibay/githubhook/buildall.pl >/tmp/buildall.log'; + system 'wget https://raw.githubusercontent.com/vishaps/voc/v2docs/src/tools/make/buildall.pl'; + exec 'perl buildall.pl >/tmp/buildall.log'; exit; -} +} print header(), start_html("Vishap Oberon github post push web hook."),