Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

Plan Branches and speculative merged code

Hi all.

I've now got Bamboo building without Docker, it's all working fine. Having come originally from a place which had disparate build tools, it's nice to have an integrated solution where the CD/CD, issue tracking and repos all talk to each other.

I've got my basic build plan working, which builds the code (such as it is at this stage) when a merge is completed into the master branch.

I've also got Plan Branches configured too - when a PR is created, the plan branch is created, and when a commit is made into that branch, that branch code is built and tested.

What would make Plan Branches perfect is for it to behave more like MS Devops, which has a very similar function, but which is very slightly different.

If a PR is created, and the target branch is configured correctly, Devops will perform a speculative (temporary) merge of your feature branch code into the target, and build *that* code, rather than the pre-merge code.

This means that if your Plan Branch code passes, you know you're OK to finish the merge. The Bamboo way tells you that your branch code is OK, but not that the merged result of your work into the target branch is OK.

I've looked around, and I can't see anything obvious as to even if this is possible.

Can anyone confirm/deny what I'm doing is possible in Bamboo?

I appreciate that I could do this by manually merging the target branch into the feature branch, but it would be nice for the tool to do this for us.

Thanks.

Pete.

1 answer

0 votes

Check the section "Automatic merge strategy" here: https://confluence.atlassian.com/bamboo/using-plan-branches-289276872.html

Hi.

Thanks for getting back to me.

I'd seen that in the options, but it's not quite what I was after. This could even be a feature request!

What Devops will do is not just build the branch code, but will perform a local merge, but not persist it anywhere, and then build that code.

The danger of a "merge with successful build" is that the code which is being built isn't the result of the merge.

We're getting round it for now by constantly merging from our main branch into our feature branch.

Thanks anyway.

Pete.

The danger of a "merge with successful build" is that the code which is being built isn't the result of the merge.

It is though. With automatic merging, Bamboo runs the merge first then builds. What is built is the merged code.

The only case when it wouldn't work 100% is if there are new commits on the target branch after the build has started. Not something Bamboo can prevent really.

OK, this is interesting. So the code isn't finally merged until the PR is approved? I think "Branch Updater" may be exactly what we're after.

I'll take a look tomorrow.

Thanks!

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bamboo

Bamboo Data Center 8.1 is now available

G’day Bamboo customers, Bamboo DC 8.1 is now available with it the following features and programs: SAML 2.0, OpenID Connect, and Crowd SSO In order to help admins with a simplified user manage...

167 views 0 4
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you