Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ES-1621: active forward merge automation from 5.1 -> 5.2 #1335

Conversation

ronanbrowne
Copy link
Contributor

@ronanbrowne ronanbrowne commented Nov 13, 2023

This PR will activate forward merge automation between 5.1 and 5.2, reducing the need for manual merges. Only one PR is raised per target branch. at a time, any outstanding changes will be swept up in the next merge once PR A is merged.

PR Description generated by merge bot
The description of the PR will be automatically filled out with all pull requests carried forward in the merge.

PR Reviewers
The original authors of the pull requests will also be tagged in the forward merge so they can sanity-check their work.

Manual merges:
On occasion, you may not wish for a change to be brought forward if this is the case, on the original PR you can add the label manual-merge. The automation checks for the presence of this label and will take no action if it is found, your change will need to be manually merged forward, if required.

Slack integration:
c5-forward-merge-bot-notifications will auto-update by a bot user once a PR is ready to be merged

@ronanbrowne ronanbrowne changed the base branch from release/os/5.2 to release/os/5.1 November 13, 2023 15:12
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@corda-jenkins-ci02
Copy link
Contributor

Scanning for breaking API changes introduced by this PR

Scan Succeeded

@corda-jenkins-ci02
Copy link
Contributor

Jenkins build for PR 1335 build 1

Build Successful:
Jar artifact version produced by this PR: 5.1.0.37-alpha-1699888375126

@corda-jenkins-ci02
Copy link
Contributor

Jenkins build for PR 1335 build 2

Build Successful:
Jar artifact version produced by this PR: 5.1.0.37-alpha-1699888382974

@ronanbrowne ronanbrowne changed the title ES-1621: active forward merge automation ES-1621: active forward merge automation from 5.1 -> 5.2 Nov 13, 2023
@ronanbrowne ronanbrowne marked this pull request as ready for review November 13, 2023 15:43
Copy link
Contributor

@vkolomeyko vkolomeyko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link

@mag1c-48 mag1c-48 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants