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

Adds pending status for uphold (uplift to 1.12.x) #6218

Merged
merged 3 commits into from
Jul 31, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jul 27, 2020

Uplift of #6140
Uplift of #6163
Uplift of #6252
Resolves brave/brave-browser#10023
Resolves brave/brave-browser#10847
Resolves brave/brave-browser#10995

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds requested a review from a team July 27, 2020 18:28
@brave-builds brave-builds self-assigned this Jul 27, 2020
@brave-builds brave-builds added this to the 1.12.x - Beta milestone Jul 27, 2020
@NejcZdovc NejcZdovc removed their request for review July 27, 2020 18:28
@kjozwiak
Copy link
Member

Looks like all the platforms are failing on init due to the following:

09:02:51  1 failed patches:
09:02:51  chrome/VERSION
09:02:51    - Patch applied because: No corresponding .patchinfo file was found.
09:02:51    - Error - Program git exited with error code 1.
09:02:51  error: patch failed: chrome/VERSION:1
09:02:51  error: chrome/VERSION: patch does not apply
09:02:51  

Going to restart and restart using WIPE_WORKSPACE to see if that helps.

@NejcZdovc NejcZdovc force-pushed the pr6140_uphold-pending_1.12.x branch from 72335ec to e58c5b1 Compare July 31, 2020 14:15
@LaurenWags
Copy link
Member

Linux failed due to known issue with RewardsBrowserTest.NotVerifiedWallet test, https://ci.brave.com/job/pr-brave-browser-pr6140_uphold-pending_1.12.x/6/execution/node/541/log/, which is logged with brave/brave-browser#10789. This does not block uplift.

Copy link
Member

@LaurenWags LaurenWags left a comment

Choose a reason for hiding this comment

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

Uplift into 1.12.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #6140 (comment) and #6252 (comment).

@LaurenWags LaurenWags merged commit 9f1c4e3 into 1.12.x Jul 31, 2020
@LaurenWags LaurenWags deleted the pr6140_uphold-pending_1.12.x branch July 31, 2020 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants