Official Cloud Mergebots now available for all

We just released Mergebots to Unity DevOps. Previously only available to our on-prem customers, Mergebots are now available to everyone, including cloud users.

Benefits of Mergebots

Mergebots can check for conflicts to further automate your CI pipeline. They do this by checking for conflicts and automatically triggering merges once several qualifying conditions have been met.

Set up requires a few clicks: Define triggers that monitor one or more branches, so that mergebots will scan and find merge conflicts before performing the merge. This process will keep your branches clean and enable easy connectivity with your preferred CI tool.

1. Using mergebots makes merging faster, more transparent, and more secure.
   
   
2. Mergebots remove repetitive and manual tasks that may slow down your programmers and artists in their day-to-day tasks.

You can find the mergebots configuration wizard under the 'Settings' button of your repository, in the Unity Dashboard website.



Within this configuration menu, you can automate your merge workflow, enable notifications, and integrate with external CI tools.

Before merging content in your cloud repository, mergebots reduce conflicts by checking if certain conditions are met:

• Checking if a code review has been created and approved
• Automatically detecting merge conflicts
• Automatically re-enqueuing failed merge requests if these were due to new changesets found in the destination branch
• Checking for individual status parameter attributes and values in order to be triggered and start the merge request automatically (Status, Resolved, Failed, Merge and Testing)

After the content has been merged, mergebots offer handy options:

• Labeling the merged changeset with your preferred nomenclature
  (for example: LABEL.${AUTO_INCREMENT_NUMBER}_${BUILD_DATE_FORMATTED, yyyy-MM-dd} will create this label, after each successful merge request handled by mergebots: LABEL.128.2018-10-23)
• Triggering a build automatically via the integration of popular third-party CI tools such as Jenkins, Team City, and Bamboo

Sample configuration

Once you have configured them, you can trigger mergebots by creating a code review from the Branch menu of your repository, from the Unity DevOps Dashboard.



Finally, once all the conditions are satisfied (Approved Code Review, No merge conflicts, Correct destination branch, etc.), the mergebots will be triggered as soon as you set the Branch attribute to “Resolved” (or whatever value you entered in the configuration wizard).



Once the Merge Request has been finalized, your code review screen should look similar to this screenshot, with 2 color indicators showing its status (pending, failed, or successful).

In the screenshot below, this is an example of how a conflict bot would look like.
It checked whether your merge request created a conflict with the main branch, or if it did not.



Finally, you may see your mergebots current status and configuration in the Settings menu of your repository. You can edit or delete your configuration settings at any time.



Comment with feedback or questions

Let us know if this suits your needs and how we could further improve the mergebot capabilities.

 

@GMG-Sam I'm sorry, but everything is server side. But, please open a ticket with support using this form: https://support.unity.com/hc/en-us/requests/new?ticket_form_id=360001051792 and we will request your org details and what's going on so we can check the logs and determine if there's a problem.

 

Hey @Tracecat, that's right. For security reasons, custom mergebots are not available in the cloud offering. But they are for the on-prem solution.

You have the trunkbot code as well online here: https://github.com/PlasticSCM/trunk-mergebot
It's correct both of them haven't been updated in a while, but the core functionality still stands. That being said, feel free to contact me at manuel.lucio at unity3d dot com if you want more details or guidance.

 

Hi, I'm afraid that the attributes are not syncable on demand. They will be synced only when you also synced some repository data. Please always use the attributed on the central repo (even if you are using a distributed workflow).
After pushing your branch, set the attribute value.

Please let us know if it helps.

Regards,
Carlos.