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

Added support for parsing issues numbers to uplift #5639

Merged
merged 1 commit into from
May 25, 2020

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented May 23, 2020

Fixes brave/brave-browser#3885

Tested using this test job (points at this branch):
https://ci.brave.com/view/wip/job/clifton-uplift-list-issues/

Feel free to run the job! 😄

Here's an example of how it looks:
#5638

Submitter Checklist:

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

After-merge Checklist:

  • The associated issue milestone is set to the smallest version that the
    changes has landed on.
  • All relevant documentation has been updated.

@bsclifton bsclifton self-assigned this May 23, 2020
@@ -60,7 +60,10 @@ def initialize(self, args):
self.github_token = get_env_var('GITHUB_TOKEN')
if len(self.github_token) == 0:
try:
result = execute(['npm', 'config', 'get', 'BRAVE_GITHUB_TOKEN']).strip()
npm_cmd = 'npm'
if sys.platform.startswith('win'):
Copy link
Member Author

Choose a reason for hiding this comment

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

angry fist shaking at Windows

@bsclifton bsclifton requested review from iefremov and simonhong May 23, 2020 08:41
@bsclifton bsclifton added this to the 1.11.x - Nightly milestone May 23, 2020
@bsclifton bsclifton added the CI/skip Do not run CI builds (except noplatform) label May 23, 2020

if len(issues_fixed) > 0:
for fixed in issues_fixed:
pr_body += (fixed[0] + '\n')
Copy link
Member Author

@bsclifton bsclifton May 23, 2020

Choose a reason for hiding this comment

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

Since match is made like (resolves|fixes|etc) issue (number), fixed has a tuple with 3 items; full string match, text matched for 1st block (ex: resolves), text matched for 2nd block (ex: 12345)

Copy link
Contributor

@emerick emerick left a comment

Choose a reason for hiding this comment

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

LGTM

script/uplift.py Outdated Show resolved Hide resolved
@bsclifton bsclifton force-pushed the bsc-add-issues-to-uplift branch from 39be1ed to 1616985 Compare May 23, 2020 16:34
@bsclifton bsclifton merged commit 3603f6b into master May 25, 2020
@bsclifton bsclifton deleted the bsc-add-issues-to-uplift branch May 25, 2020 20:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip Do not run CI builds (except noplatform)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Enhancements for the PR uplifter CI job
3 participants