Use the merge train to automatically update auto-deploy branches with changes from master
Using the Merge Train project we can automatically merge master into an auto-deploy branch, removing the need to do so manually. For this to work, we need to make the following changes:
- Set up a Release Tools schedule that takes the latest auto-deploy branch, and triggers a merge-train pipeline
- Make sure this pipeline performs a security merge, so it fails when there are conflicts
- Run this job every 15 minutes
- Make sure this job doesn't schedule any pipelines if there are no changes. This can be done by just checking that both
masterand the auto-deploy branch have the same last commit, using the API.