megamanmalte/hydra
1
0
Fork 0
mirror of https://github.com/NixOS/hydra.git synced 2024-10-22 22:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nix-2.23' into nix-2.24-upgrade-wip

Browse source
This commit is contained in:
John Ericson 2024-09-24 11:50:03 -04:00
parent 0231453cc5 029116422d
commit 9a75361781
5 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos-modules/hydra.nix
View file

@ -464,10 +464,12 @@ in
'' ''
set -eou pipefail set -eou pipefail
compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf) compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf)
if [[ $compression == zstd ]]; then if [[ $compression == "" ]]; then
compression="bzip2"
elif [[ $compression == zstd ]]; then
compression="zstd --rm" compression="zstd --rm"
fi fi
find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r $compression --force --quiet find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c | xargs -r "$compression" --force --quiet
''; '';
startAt = "Sun 01:45"; startAt = "Sun 01:45";
}; };

1
src/hydra-queue-runner/state.hh
View file

@ -23,6 +23,7 @@
#include "nar-extractor.hh" #include "nar-extractor.hh"
#include "serve-protocol.hh" #include "serve-protocol.hh"
#include "serve-protocol-impl.hh" #include "serve-protocol-impl.hh"
#include "serve-protocol-connection.hh"
#include "machines.hh" #include "machines.hh"

2
src/lib/Hydra/Controller/Root.pm
View file

@ -330,7 +330,7 @@ sub nar :Local :Args(1) {
else { else {
$path = $Nix::Config::storeDir . "/$path"; $path = $Nix::Config::storeDir . "/$path";
gone($c, "Path " . $path . " is no longer available.") unless isValidPath($path); gone($c, "Path " . $path . " is no longer available.") unless $MACHINE_LOCAL_STORE->isValidPath($path);
$c->stash->{current_view} = 'NixNAR'; $c->stash->{current_view} = 'NixNAR';
$c->stash->{storePath} = $path; $c->stash->{storePath} = $path;

2
src/lib/Hydra/Plugin/S3Backup.pm
View file

@ -92,7 +92,7 @@ sub buildFinished {
my $hash = substr basename($path), 0, 32; my $hash = substr basename($path), 0, 32;
my ($deriver, $narHash, $time, $narSize, $refs) = queryPathInfo($path, 0); my ($deriver, $narHash, $time, $narSize, $refs) = queryPathInfo($path, 0);
my $system; my $system;
if (defined $deriver and isValidPath($deriver)) { if (defined $deriver and $MACHINE_LOCAL_STORE->isValidPath($deriver)) {
$system = derivationFromPath($deriver)->{platform}; $system = derivationFromPath($deriver)->{platform};
} }
foreach my $reference (@{$refs}) { foreach my $reference (@{$refs}) {

2
src/lib/Hydra/Plugin/SubversionInput.pm
View file

@ -46,7 +46,7 @@ sub fetchInput {
$MACHINE_LOCAL_STORE->addTempRoot($cachedInput->storepath) if defined $cachedInput; $MACHINE_LOCAL_STORE->addTempRoot($cachedInput->storepath) if defined $cachedInput;
if (defined $cachedInput && isValidPath($cachedInput->storepath)) { if (defined $cachedInput && $MACHINE_LOCAL_STORE->isValidPath($cachedInput->storepath)) {
$storePath = $cachedInput->storepath; $storePath = $cachedInput->storepath;
$sha256 = $cachedInput->sha256hash; $sha256 = $cachedInput->sha256hash;
} else { } else {