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

Update BRE android (uplift to 1.18.x) #7401

Merged
merged 2 commits into from
Dec 11, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Dec 10, 2020

Uplift of #7378
Resolves brave/brave-browser#12488

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 as a code owner December 10, 2020 02:43
@brave-builds brave-builds requested review from marshall, emerick and a team and removed request for a team December 10, 2020 02:43
@brave-builds brave-builds self-assigned this Dec 10, 2020
@brave-builds brave-builds added this to the 1.18.x - Release milestone Dec 10, 2020
@kjozwiak
Copy link
Member

Restarting iOS via https://ci.brave.com/job/pr-brave-browser-pr7378_update_bre_android_1.18.x-ios/2/ as build failed as per https://ci.brave.com/job/pr-brave-browser-pr7378_update_bre_android_1.18.x-ios/1/execution/node/189/log/.

22:04:17  FAILED: obj/base/base/json_writer.o 

Restarting Android as dist failed as per

22:25:15  FAILED: obj/chrome/android/chrome_java.javac.jar obj/chrome/android/chrome_java.javac.jar.info 

@kjozwiak
Copy link
Member

test-browser failed on macOS due to several reward failures as per https://ci.brave.com/job/pr-brave-browser-pr7378_update_bre_android_1.18.x-macos/1/execution/node/253/log/. However, several of these are known intermittent issues as per brave/brave-browser#12607, brave/brave-browser#12704, brave/brave-browser#12607, brave/brave-browser#12605 and brave/brave-browser#12605.

23:47:26  5 tests failed:
23:47:26      RewardsBrowserTest.ResetRewardsWithBAT (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:374)
23:47:26      RewardsBrowserTest.UpholdLimitNoBAT (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:397)
23:47:26      RewardsContributionBrowserTest.TipUnverifiedPublisher (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:303)
23:47:26      RewardsPromotionBrowserTest.ClaimViaPanel (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:201)
23:47:26      RewardsPromotionBrowserTest.ClaimViaSettingsPage (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:195)

Restarting iOS via https://ci.brave.com/job/pr-brave-browser-pr7378_update_bre_android_1.18.x-ios/3/ as it failed at the same spot as #7401 (comment).

Restarting Android via https://ci.brave.com/job/pr-brave-browser-pr7378_update_bre_android_1.18.x-android/3/ as dist failed as per https://ci.brave.com/job/pr-brave-browser-pr7378_update_bre_android_1.18.x-android/2/execution/node/203/log/.

23:16:47  FAILED: obj/chrome/android/chrome_java.javac.jar obj/chrome/android/chrome_java.javac.jar.info 

Copy link
Member

@kjozwiak kjozwiak 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.18.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #7378 (comment) & #7378 (comment).

@kjozwiak kjozwiak merged commit e3c4bf9 into 1.18.x Dec 11, 2020
@kjozwiak kjozwiak deleted the pr7378_update_bre_android_1.18.x branch December 11, 2020 08:17
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.

4 participants