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 +4 -4
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c2b90d235f - Show all commits

4
src/libstore/build/derivation-goal.cc
View file

@ -649,7 +649,7 @@ Goal::WorkResult DerivationGoal::inputsRealised(bool inBuildSlot)
slot to become available, since we don't need one if there is a slot to become available, since we don't need one if there is a
build hook. */ build hook. */
state = &DerivationGoal::tryToBuild; state = &DerivationGoal::tryToBuild;
return ContinueImmediately{}; return tryToBuild(inBuildSlot);
} }
void DerivationGoal::started() void DerivationGoal::started()
@ -772,7 +772,7 @@ Goal::WorkResult DerivationGoal::tryToBuild(bool inBuildSlot)
actLock.reset(); actLock.reset();
state = &DerivationGoal::tryLocalBuild; state = &DerivationGoal::tryLocalBuild;
return ContinueImmediately{}; return tryLocalBuild(inBuildSlot);
} }
Goal::WorkResult DerivationGoal::tryLocalBuild(bool inBuildSlot) { Goal::WorkResult DerivationGoal::tryLocalBuild(bool inBuildSlot) {

4
src/libstore/build/substitution-goal.cc
View file

@ -188,7 +188,7 @@ Goal::WorkResult PathSubstitutionGoal::referencesValid(bool inBuildSlot)
assert(worker.store.isValidPath(i)); assert(worker.store.isValidPath(i));
state = &PathSubstitutionGoal::tryToRun; state = &PathSubstitutionGoal::tryToRun;
return ContinueImmediately{}; return tryToRun(inBuildSlot);
} }
@ -256,7 +256,7 @@ Goal::WorkResult PathSubstitutionGoal::finished(bool inBuildSlot)
/* Try the next substitute. */ /* Try the next substitute. */
state = &PathSubstitutionGoal::tryNext; state = &PathSubstitutionGoal::tryNext;
return ContinueImmediately{}; return tryNext(inBuildSlot);
} }
worker.markContentsGood(storePath); worker.markContentsGood(storePath);