Remote run on a feature branch
I was using the SVN earlier and was happy with pre-tested commits now moved to git and using feature branch model, would like to do remote run. There should be either of following should work (non working currently)
1. Feature branch has some commits and some non committed changes, so remote run should patch the all changes of feature branch (committed and un-committed) and run again mainstream. This would stamp merge readiness.
2. User can perform the re-base from mainstream and then could remote run against feature branch but there is no option to select the feature branch while remote run.
I am using the following :
IntelliJ IDEA 2016.1.3
Build #IC-145.1617, built on June 3, 2016
Teamcity integraion plugin : Version: 2017.2.50909
Teamcity server : TeamCity Enterprise 9.0 (build 32060)
Please sign in to leave a comment.
Hi Kailash,
I'm afraid this feature isn't directly translatable from SVN into Git. As you have already posted in https://youtrack.jetbrains.com/issue/TW-23337, I'll try to make a couple suggestions of possible workarounds, but they do definitely require some change in the workflow.
The first and most obvious would be to, instead of pushing personal builds against master, use feature branches completely, given that it's a very fast operation in git. You can keep two separate configurations, one for the main branch, another one for all the others, and users can run their builds normally against the other (so, no personal builds, simply commit and the VCS trigger runs the builds). TeamCity will automatically show each build with the branch it's been run on, so you should be able to see which branches are ready to merge by seeing successful builds.
Another option, if you don't have a large amount of branches, is to have separate configurations for each branch. Simply configure the default branch differently for each configuration, and users can run remote builds against the specific build configurations. If desired, TeamCity has an automatic merge feature that would automatically merge the changes into the branch.
For both scenarios, a build template can be used to share most of the configuration, so maintenance overhead is reduced to a minimum.
Hope this helps.
Thanks Denis for your reply.
Actually I have configured Teamcity to poll feature branches along with Master so users can build directly on TC but developers are looking for feature where they can perform remote run against mainstream (master in this case) including committed and non committed code in feature branch so that they got confidence that code would not break the master after the merge.
If we build the feature branches on TC, its required to rebase from master every time as master in the running one, so looking for something where either user can choose the branch while remote run apart from default branch or remote run perform the patch of all changes of feature branch against default branch (master)
We can not configure the feature branches as default because they are lot in count.