Community
Participate
Working Groups
The R3_6_maintenance branch currently does not accurately build R3_6_maintenance due to the update code: git clean -fdx git checkout -f git submodule foreach git clean -fdx git submodule foreach git checkout -f git submodule foreach git merge origin/master Basically it's a fairly simple code that pulls in the latest from origin/master which worked fine when R3_6_maintenance was building against master but now it needs to actually build origin/R3_6_maintenance. The problem at the moment is that not all the submodules have R3_6_maintenance branches yet... In Platform project we have a text file that contains a checkout mapping for all the submodules so that we can script it to pull the correct branch for each submodule [1] we should probably do the same here. [1] http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/tree/streams/repositories.txt
I will look into fixing this.
(In reply to Thanh Ha from comment #0) > The R3_6_maintenance branch currently does not accurately build > R3_6_maintenance due to the update code: > > git clean -fdx > git checkout -f > git submodule foreach git clean -fdx > git submodule foreach git checkout -f > git submodule foreach git merge origin/master > > Just to be clear this comes from the bash build step in the Hudson job configuration [1] just before we run "Maven". [1] https://hudson.eclipse.org/webtools/job/WTP-R3_6_Maintenance/configure
Fixed in master with: http://git.eclipse.org/c/webtools/webtools.releng.aggregator.git/commit/?id=745d2d464e8b43a5054abd053b89607a6a24343d Fixed in R3_6_maintenance with: http://git.eclipse.org/c/webtools/webtools.releng.aggregator.git/commit/?h=R3_6_maintenance&id=739baf2c3c7c977841bb6a81d6c93a864a39ad86 There now exists a scripts/repositories.txt file that contains a repo:branch mapping of all the submodules that should be updated. A additional script scripts/submodule-checkout.sh should be used to ensure Hudson checks out the latest of each correct submodule branch when performing a build. As more R3_6_maintenance branches are created for the various submodules we need to ensure that repositories.txt is properly updated to pull in the correct building branches.
