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 for bat points text (uplift to 1.7.x) #5072

Merged
merged 1 commit into from
Mar 27, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Mar 26, 2020

Uplift of #5069

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 self-assigned this Mar 26, 2020
@brave-builds brave-builds added this to the 1.7.x - Beta milestone Mar 26, 2020
@kjozwiak
Copy link
Member

@samartnik looks like this particular PR only touches a single file that's android only:

  • android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java

In cases were the only files that are being touched are a specific platform, in this case Android, you can use the following skip labels:

  • CI/skip-ios, CI/skip-linux, CI/skip-macos, CI/skip-windows

@kjozwiak
Copy link
Member

Looks like the only remaining Jenkins failure is on macOS due to test-browser failing as per https://ci.brave.com/job/brave-browser-build-pr/job/pr5069_android_bat_points_text_fix_1.7.x/1/execution/node/594/log/.

17:35:57  [508/508] BraveRewardsBrowserTest.TipConnectedPublisherAnonAndConnected (TIMED OUT)
17:35:57  1 test timed out:
17:35:57      BraveRewardsBrowserTest.TipConnectedPublisherAnonAndConnected (../../brave/components/brave_rewards/browser/rewards_service_browsertest.cc:2762)

However, as per #5072 (comment), this PR only touches a single file associated with Android so there's no need to restart. This is also a known issue as per brave/brave-browser#8881.

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.7.x approved after deliberating with @brave/uplift-approvers. Please make sure that all the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit 01e1a10 into 1.7.x Mar 27, 2020
@kjozwiak kjozwiak deleted the pr5069_android_bat_points_text_fix_1.7.x branch March 27, 2020 05:12
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.

3 participants