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

912: PR title correction logic can get stuck #1050

Closed

Conversation

magicus
Copy link
Member

@magicus magicus commented Mar 11, 2021

The PR title correct logic introduced with SKARA-572 can end up trying to correct the title forever. An observed case is where the JBS title ends with a trailing space. When trying to update the PR title to include this trailing space, it will be stripped by GitLab and no update will actually be done. This will then get retried again and again.

The fix is to strip the JBS title before doing any comparisons.


Progress

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

Issue

  • SKARA-912: PR title correction logic can get stuck

Reviewers

Download

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 11, 2021

👋 Welcome back ihse! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr label Mar 11, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 11, 2021

Webrevs

@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 11, 2021

Mailing list message from Magnus Ihse Bursie on skara-dev:

How come this email got a [skara] prefixed to the subject? But not the
one for SKARA-913???

Hm... Checking my email history, there seems to be a handful of mails
that has gotten a [skara] prefix, starting February 10th (but most of
the mails do *not* get this). Did some configuration change happen that
day? Is this prefix added by Skara mailing list bots, or by Mailman?

I find this kinds of prefix annoying, but the intermittency is certainly
even more annoying!

/Magnus

On 2021-03-11 12:53, Magnus Ihse Bursie wrote:

Copy link
Member

@rwestberg rwestberg left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Mar 12, 2021

@magicus This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

After integration, the commit message for the final commit will be:

912: PR title correction logic can get stuck

Reviewed-by: rwestberg

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 4 new commits pushed to the master branch:

  • edb217f: pr: update /backport command
  • 236a071: Allow merge PRs with an exact hash
  • dbef34b: 913: Skara should honor .gitconfig and /etc/gitconfig
  • fd80e0a: forge: add HostedRepository.restrictPushAccess

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

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

@openjdk openjdk bot added the ready label Mar 12, 2021
@magicus
Copy link
Member Author

@magicus magicus commented Mar 12, 2021

/integrate

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

@openjdk openjdk bot commented Mar 12, 2021

@magicus Since your change was applied there have been 4 commits pushed to the master branch:

  • edb217f: pr: update /backport command
  • 236a071: Allow merge PRs with an exact hash
  • dbef34b: 913: Skara should honor .gitconfig and /etc/gitconfig
  • fd80e0a: forge: add HostedRepository.restrictPushAccess

Your commit was automatically rebased without conflicts.

Pushed as commit e664a65.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@magicus magicus deleted the correct-correct-pr-title-logic branch Sep 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants