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

Compare commits

base: ma27:995e1922d726d50bf87be602043bf14caa9f2d24
Branches Tags
ma27:main
ma27:update-lix
ma27:hydra.ist.nicht-so.sexy
ma27:lix/devenv-fixup
ma27:lix/fix-readIntoSocket
lix-project:main
lix-project:lix-update
..
compare: ma27:06a30ec8df139cd4c7fb21ba9beb1dc54a4fc3fa
Branches Tags
ma27:update-lix
ma27:hydra.ist.nicht-so.sexy
ma27:main
ma27:lix/devenv-fixup
ma27:lix/fix-readIntoSocket
lix-project:main
lix-project:lix-update

No commits in common. "995e1922d726d50bf87be602043bf14caa9f2d24" and "06a30ec8df139cd4c7fb21ba9beb1dc54a4fc3fa" have entirely different histories.
995e1922d7 ... 06a30ec8df

2 changed files with 8 additions and 9 deletions
Show stats Expand all files Collapse all files

14
flake.lock
View file

@ -48,11 +48,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1728163191, "lastModified": 1727334821,
"narHash": "sha256-SW0IEBsPN1EysqzvfDT+8Kimtzy03O1BxQQm7ZB6fRY=", "narHash": "sha256-80CJtKmLvPOUnqz9O6rLYUoTHtVXI3KCQ/ahPgpDACA=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "ed9b7f4f84fd60ad8618645cc1bae2d686ff0db6", "rev": "31954b51367737defbae87fba053b068897416fb",
"revCount": 16323, "revCount": 16258,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/lix" "url": "https://git.lix.systems/lix-project/lix"
}, },
@ -126,11 +126,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728193676, "lastModified": 1727264057,
"narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
src/hydra-queue-runner/builder.cc
View file

@ -1,6 +1,5 @@
#include <cmath> #include <cmath>
#include "error.hh"
#include "state.hh" #include "state.hh"
#include "hydra-build-result.hh" #include "hydra-build-result.hh"
#include "finally.hh" #include "finally.hh"
@ -186,7 +185,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
unlink(result.logFile.c_str()); unlink(result.logFile.c_str());
} }
} catch (...) { } catch (...) {
ignoreExceptionInDestructor(); ignoreException();
} }
} }
}); });