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

Jump to bottom

340: Infer master for repos in the same org for merge style PRs #554

Closed
wants to merge 2 commits into from
Closed

340: Infer master for repos in the same org for merge style PRs #554

wants to merge 2 commits into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Mar 31, 2020 •
edited by openjdk[bot] bot

Hi all,

Please review this change that allows a shorter form when merging the master branch from a repo in the same org.

Best regards,
Robin

Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • SKARA-340: Infer master for repos in the same org for merge style PRs

Reviewers

  • Erik Helin (ehelin - Reviewer) ⚠️ Review applies to 1e97100

Download

$ git fetch https://git.openjdk.java.net/skara pull/554/head:pull/554
$ git checkout pull/554

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 31, 2020

👋 Welcome back rwestberg! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 31, 2020 •
edited

Webrevs

edvbld
edvbld approved these changes Mar 31, 2020
View changes
Copy link
Member

@edvbld edvbld left a comment

Looks good, just two minor comments inline

bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
.anyMatch(branch -> branch.equals(branchMatcher.group(1)));
if (!isValidBranch) {
// Assume the name refers to a sibling repository
var repoName = Path.of(pr.repository().name()).resolveSibling(branchMatcher.group(1)).toString();
Copy link
Member

@edvbld edvbld Mar 31, 2020

Choose a reason for hiding this comment

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

Perhaps check that the repo actually exists?

Copy link
Member Author

@rwestberg rwestberg Mar 31, 2020

Choose a reason for hiding this comment

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

It will be checked a bit later (around line 193).

bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
@@ -127,6 +127,17 @@ private MergeSource(String repositoryName, String branchName) {
if (!branchMatcher.matches()) {
return Optional.empty();
}

// Verify that the branch exists
Copy link
Member

@edvbld edvbld Mar 31, 2020

Choose a reason for hiding this comment

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

Suggested change
// Verify that the branch exists
// Check if name refers to branch or repository

Copy link
Member Author

@rwestberg rwestberg Mar 31, 2020

Choose a reason for hiding this comment

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

So the check is only done partially here.. :)

@openjdk
Copy link

@openjdk openjdk bot commented Mar 31, 2020 •
edited

@rwestberg This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

340: Infer master for repos in the same org for merge style PRs

Reviewed-by: ehelin
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 87965d817199d72b24cd298415f4955e9ce30aa0.

➡️ To integrate this PR with the above commit message, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Mar 31, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Mar 31, 2020

/integrate

@openjdk openjdk bot closed this Mar 31, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Mar 31, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Mar 31, 2020

@rwestberg The following commits have been pushed to master since your change was applied:

  • 87965d8: 343: Use ssh -G for parsing ssh configuration files

Your commit was automatically rebased without conflicts.

Pushed as commit 32bba61.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 31, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: 32bba61
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-03-31 09:42:18 +0000
URL: https://git.openjdk.java.net/skara/commit/32bba611

340: Infer master for repos in the same org for merge style PRs

Reviewed-by: ehelin

! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edvbld edvbld

Assignees
No one assigned
Labels
bots integrated
Milestone
No milestone
2 participants
@rwestberg @edvbld