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.

Sign up for GitHub

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

Fixes to uplift script #1775

Merged
merged 3 commits into from
Feb 26, 2019
Merged

Fixes to uplift script #1775

merged 3 commits into from
Feb 26, 2019

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Feb 25, 2019 •
edited
Loading

Description

A few important updates:

  • Script renamed to uplift.py
  • Argument --uplift-using-pr is no longer optional; you can ONLY uplift MERGED pull requests
  • Commits for uplifts are squashed and PR number is linked / release channel is mentioned (ex: Uplift of #1762 (squashed) to dev)
  • Removed --reviewers argument and instead assign the Uplift Approvers team
  • Script now works properly for https 😄 (which means we can use in Jenkins)

Actions to take after merge

@bsclifton bsclifton self-assigned this Feb 25, 2019
@bsclifton bsclifton added this to the 0.63.x - Nightly milestone Feb 25, 2019
@bsclifton bsclifton mentioned this pull request Feb 25, 2019
Closed
@bsclifton
Commits are now squashed when uplifting
9bca711 
- if available, a PR number is linked in commit msg
- otherwise, local branch is linked in commit msg
@bsclifton
git push via https now works
7e97d17
@bsclifton
Copy link
Member Author

bsclifton commented Feb 25, 2019 •
edited
Loading

For an example of commits being squashed, see f4f45ea in #1776

@bsclifton bsclifton changed the title Fixes to PR script WIP - Fixes to PR script Feb 25, 2019
@bsclifton
Copy link
Member Author

Marking as WIP - got some additional feedback 😄

@bsclifton bsclifton force-pushed the enhance-pr-script branch 3 times, most recently from 0884647 to 89faeaa Compare February 25, 2019 20:14
@bsclifton bsclifton force-pushed the enhance-pr-script branch 5 times, most recently from 2e191dd to 151a88c Compare February 25, 2019 20:23
@bsclifton bsclifton changed the title WIP - Fixes to PR script Fixes to uplift script Feb 25, 2019
@bsclifton
Copy link
Member Author

Updated after more feedback 😄 👍
cc: @darkdh @mihaiplesa

@bsclifton
Copy link
Member Author

bsclifton commented Feb 25, 2019 •
edited
Loading

Got to work out a problem here with Python (it's complaining about Requests module not found), but (when that is worked out) you'll be able to try a live demo out here:
https://staging.ci.brave.com/view/wip/job/mihai-create-uplift-prs/build?delay=0sec

@mihaiplesa
Copy link
Collaborator

We should install it via pip on the Mac nodes.

@bsclifton
Copy link
Member Author

bsclifton commented Feb 25, 2019 •
edited
Loading

@mihaiplesa fixed it by specifying the full path to Python. You can see a run here:
https://staging.ci.brave.com/view/wip/job/mihai-create-uplift-prs/21/console

NOTE: the job includes --dry-run; that would need to be removed in order for the job to do anything

@bsclifton
Copy link
Member Author

Ready for review 👍

mihaiplesa
mihaiplesa approved these changes Feb 26, 2019
View reviewed changes
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.

looking good

@bsclifton bsclifton merged commit 1fc093e into master Feb 26, 2019
@bsclifton bsclifton deleted the enhance-pr-script branch February 26, 2019 21:57
bsclifton added a commit that referenced this pull request Mar 6, 2019
@bsclifton
Merge pull request #1775 from brave/enhance-pr-script
402d668 
Fixes to uplift script
bsclifton added a commit that referenced this pull request Mar 6, 2019
@bsclifton
Merge pull request #1775 from brave/enhance-pr-script
cb12ab5 
Fixes to uplift script
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mihaiplesa mihaiplesa mihaiplesa approved these changes

@darkdh darkdh Awaiting requested review from darkdh

@bbondy bbondy Awaiting requested review from bbondy

Assignees

@bsclifton bsclifton

Labels
None yet
Projects
None yet
Milestone
0.63.x - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@bsclifton @mihaiplesa