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

Fix bugs found when trying to uplift #1655

Merged
merged 1 commit into from
Feb 13, 2019
Merged

Fix bugs found when trying to uplift #1655

merged 1 commit into from
Feb 13, 2019

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Feb 13, 2019

Description

Fix bugs found when trying to uplift #1632

The original (merged) version of the script was not using the SHA for comparing PR branch against what used to be master (instead, it would compare master against master). This caused any merged PRs to not work as expected

This fixes the problem by instead by comparing HEAD against the SHA pre-merge

Commit message details:

  • version check is no longer done; this caused problems because it's comparing brave-browser against brave-core
  • PR uplift wasn't using the SHA- which means it didn't find any commits when doing compare (ex: it did master against master)

Usage that was breaking

./script/pr.py --reviewers=bbondy,kjozwiak,rebron,srirambv --owners=bsclifton --uplift-to=release --uplift-using-pr=1632

- version check is no longer done; this caused problems because it's comparing brave-browser against brave-core
- PR uplift wasn't using the SHA- which means it didn't find any commits when doing compare (ex: it did master against master)
Copy link
Collaborator

@mihaiplesa mihaiplesa left a comment

Choose a reason for hiding this comment

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

looks good to me

@bsclifton bsclifton merged commit fbfbdbe into master Feb 13, 2019
@bsclifton bsclifton deleted the npm-run-pr2 branch February 13, 2019 22:22
fmarier pushed a commit that referenced this pull request Oct 29, 2019
Include Linux release channel instructions in ReadTheDocs.
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.

2 participants