zebreus/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 1 Activity

Fix tests on systems with a non-master git defaultBranch #1

Open
zebreus wants to merge 140 commits from fix-tests-without-master into main
pull from: fix-tests-without-master
merge into: zebreus:main
Conversation 0 Commits 140 Files changed 216 +6 -13
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 03cbc0ecb9 - Show all commits

12
src/libstore/build/entry-points.cc
View file

@ -26,11 +26,11 @@ void Store::buildPaths(const std::vector<DerivedPath> & reqs, BuildMode buildMod
StringSet failed; StringSet failed;
std::shared_ptr<Error> ex; std::shared_ptr<Error> ex;
for (auto & [i, result] : goals) { for (auto & [i, result] : goals) {
if (i->ex) { if (result.ex) {
if (ex) if (ex)
logError(i->ex->info()); logError(result.ex->info());
else else
ex = i->ex; ex = result.ex;
} }
if (result.exitCode != Goal::ecSuccess) { if (result.exitCode != Goal::ecSuccess) {
if (auto i2 = dynamic_cast<DerivationGoal *>(i.get())) if (auto i2 = dynamic_cast<DerivationGoal *>(i.get()))
@ -119,9 +119,9 @@ void Store::ensurePath(const StorePath & path)
auto [goal, result] = *goals.begin(); auto [goal, result] = *goals.begin();
if (result.exitCode != Goal::ecSuccess) { if (result.exitCode != Goal::ecSuccess) {
if (goal->ex) { if (result.ex) {
goal->ex->withExitStatus(worker.failingExitStatus()); result.ex->withExitStatus(worker.failingExitStatus());
throw std::move(*goal->ex); throw std::move(*result.ex);
} else } else
throw Error(worker.failingExitStatus(), "path '%s' does not exist and cannot be created", printStorePath(path)); throw Error(worker.failingExitStatus(), "path '%s' does not exist and cannot be created", printStorePath(path));
} }

1
src/libstore/build/goal.cc
View file

@ -25,7 +25,6 @@ try {
BOOST_OUTCOME_CO_TRY(auto result, co_await workImpl()); BOOST_OUTCOME_CO_TRY(auto result, co_await workImpl());
trace("done"); trace("done");
ex = result.ex;
notify->fulfill(result); notify->fulfill(result);
cleanup(); cleanup();

6
src/libstore/build/goal.hh
View file

@ -118,12 +118,6 @@ protected:
virtual kj::Promise<Result<WorkResult>> workImpl() noexcept = 0; virtual kj::Promise<Result<WorkResult>> workImpl() noexcept = 0;
public: public:
/**
* Exception containing an error message, if any.
*/
std::shared_ptr<Error> ex;
explicit Goal(Worker & worker, bool isDependency) explicit Goal(Worker & worker, bool isDependency)
: worker(worker) : worker(worker)
, isDependency(isDependency) , isDependency(isDependency)