Commit Graph
29 Commits
Author SHA1 Message Date
Jakub Wądołowski 22ed791e75 fix(script/uplift): Handle empty cherry-pick errors gracefully (#33142)
* fix(script/uplift): Handle empty cherry-picks

* fix(script/uplift): Skip commit squashing for empty change sets
2026-03-03 16:58:01 +01:00
Brian Clifton 24bf1c5097 [uplift script] Add missing reference (#28739)
Add missing reference

Fixes https://github.com/brave/brave-browser/issues/45572
2025-04-18 11:54:35 -07:00
Brian Clifton 075810d0b5 [uplift script] Add new arg to copy CI/* labels (from the PR being uplifted) (#28713)
* Add new arg to copy "CI/*" labels from PR

Fixes https://github.com/brave/brave-browser/issues/45503

* presubmit fixes
2025-04-17 09:46:39 -07:00
Mihai PLESA fe59801751 comment fix 2023-08-07 13:48:19 +01:00
Mihai PLESA 1ccc9522a6 remove brave github token (#19536) 2023-08-07 08:36:41 -04:00
Ahmed Kamal 675dae8450 uplift.py: uplift-to is now a csv list of channels to uplift-to (#19557)
* uplift-to is now a csv list of ch to uplift-to

* fmt shorter help msg

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* yapf fmt

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

---------

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>
2023-08-07 05:26:56 -04:00
Ahmed Kamal 0e8231a1b1 Uplift script should fail if milestone not found (#17599)
* wip

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* X (revert me)

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* raise exception if milestone not found. script exit(1)

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* duh

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* don't suppress exceptions

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* unduh

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* wip

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

---------

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>
2023-03-15 04:27:32 -04:00
Ahmed Kamal aff9e8432c Uplift scripts py2 and py3 compatibility (#14182)
* Initial port

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* cleanup unused imports and exception vars

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* cleanup unused imports and exception vars

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* cleanup unused imports and exception vars

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* some fixes for pylint

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* some pylint fixes

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>
2022-07-25 09:44:42 -05:00
Ahmed Kamal 790e23a944 Fix reference not a tree (#14175)
Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>
2022-07-25 15:30:20 +02:00
Ahmed Kamal 8695d6a274 Allow uplifting unmerged prs (#14202)
* Allow uplifting unmerged prs

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* remove outdated comment

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* Allow uplifting unmerged prs

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* remove outdated comment

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>

* Use print() syntax

Signed-off-by: Ahmed Kamal <email.ahmedkamal@googlemail.com>
2022-07-21 14:42:01 +02:00
Mihai PLESA ebb3f149ea removed the need for brave-browser repo (#13006) 2022-04-15 17:47:43 -05:00
Mihai PLESA 49874507d1 fixed line lengths to 80 and do autopep8 2021-10-29 17:54:41 -05:00
Brian Clifton e1275f602c Update uplift template
Fixes https://github.com/brave/brave-browser/issues/14052
2021-02-08 23:20:05 -07:00
Matt Bacchi d3b6386f1f Check for milestone name starting with "Android"
Resolves: https://github.com/brave/brave-browser/issues/10449
2020-07-07 09:07:23 -06:00
ryanml becb4be0ee Fixes brave/brave-browser#9938 - Adds an audit script that ignores dev vulnerabilities. 2020-05-25 17:02:47 -07:00
Brian Clifton 1616985548 Added support for parsing issues numbers to uplift
Fixes https://github.com/brave/brave-browser/issues/3885
2020-05-23 09:34:22 -07:00
Brian Clifton 09de7b8363 Revert "Merge pull request #1857 from brave/bsc-fix-reviewers"
This reverts commit 9500b11632, reversing
changes made to 8167ade229.
2020-05-22 10:54:31 -07:00
Brian Clifton c6cb8d55b9 Hack which can be reverted when 1.7 hits release channel 2020-03-10 15:59:16 -07:00
Brian Clifton 908616711a Updates which should remove dev as a channel for the uplift script 2020-03-10 09:45:28 -07:00
Matt Bacchi 3634260691 Do not populate 'channels_to_process' list unless it is empty
Fixes: https://github.com/brave/brave-browser/issues/8327
2020-02-20 08:34:04 -07:00
Mihai Plesa e95a569e4a added github upload for android apks 2020-01-15 11:20:26 +00:00
NejcZdovc 16bcbe23c5 Adds uplift template to our uplifter
Resolves https://github.com/brave/brave-browser/issues/4382
2019-05-10 11:43:56 +02:00
Matt Bacchi dcdb64c941 Add commandline flag to enable GPG signing of commit 2019-04-26 09:10:34 -06:00
Brian Clifton 932973d12c Fix two bugs with uplift: get latest for channel branch and put version at END of branch name (instead of at beginning)
- Creating a new branch was checking out the channel branch (ex: 0.62.x) but wasn't pulling latest
- Jenkins skips PR builder for any branch starting with "0" (ex: "0.62.x_fix-the-thing"). This moves version to end
2019-03-18 09:10:40 -07:00
Mihai Plesa 7c4dad6ae5 added nightly channel 2019-03-14 12:26:40 +00:00
Brian Clifton 9500b11632 Merge pull request #1857 from brave/bsc-fix-reviewers
Manually set the uplift-approvers
2019-03-05 16:58:25 -07:00
Brian Clifton de12eaa564 Manually set the uplift-approvers
Automated user (@brave-builds) would need to be an org member in order for assignment to work.
API returns super vague error:
"Could not resolve to a node with the global id of \'REDACTED\'."
2019-03-05 16:51:07 -07:00
Brian Clifton 81b5dfc9a5 Grab the title from the original PR being uplifted 2019-03-05 15:44:42 -07:00
Brian Clifton bf57ac6a6e Renamed script; Now requires a PR# to uplift. Reviewers are auto-assigned. 2019-02-25 13:23:48 -07:00