Bug #12556
The mergebasebranch option's base branch merge does not update submodules
Start date:
2017-05-17
Due date:
% Done:
100%
Description
So branches will build and run the test suite with the Git submodule state as if the base branch merge didn’t happen, while Tails Git itself has the correct state.
Concrete example: feature/5630-deterministic-builds has feature/stretch as base branch. On May 5th we updated the Chutney submodule so Tor is not broken in the test suite. But when feature/5630* merges feature/stretch (due to mergebasebranch) it won’t checkout the new Git submodule state, and that is why this branch still fails all tests using Tor.
Subtasks
History
#1 Updated by anonym 2017-05-17 09:15:05
- Status changed from Confirmed to In Progress
- Assignee set to anonym
- % Done changed from 0 to 50
- QA Check set to Ready for QA
- Feature Branch set to bugfix/12556-mergebasebranch-update-submodules
Note to self: look at Jenkins’ build logs if this works.
#2 Updated by intrigeri 2017-05-26 12:43:55
- Status changed from In Progress to Fix committed
- % Done changed from 50 to 100
Applied in changeset commit:963801f682b40fbd866442e9ecb1371a68c2f153.
#3 Updated by intrigeri 2017-05-26 12:46:03
- Assignee deleted (
anonym) - QA Check changed from Ready for QA to Pass
#4 Updated by intrigeri 2017-06-12 16:07:12
- Status changed from Fix committed to Resolved