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

Manual uplift of PR 5348 to 1.9.x #5370

Merged
merged 1 commit into from
May 4, 2020
Merged

Manual uplift of PR 5348 to 1.9.x #5370

merged 1 commit into from
May 4, 2020

Conversation

gdregalo
Copy link
Contributor

@gdregalo gdregalo commented Apr 25, 2020 •
edited by kjozwiak
Loading

Uplift of #5348
Fixes brave/brave-browser#8641
Disable background ads on Android

  • 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.

@gdregalo gdregalo added this to the 1.9.x - Beta milestone Apr 25, 2020
@gdregalo gdregalo requested a review from a team April 25, 2020 01:37
@kjozwiak
Copy link
Member

kjozwiak commented May 4, 2020

Restarting iOS as init failed as per https://ci.brave.com/job/brave-browser-build-pr/job/pr5348-android-bg-ads-off-uplift-1.9.x/1/execution/node/156/log/

Looks like test-install failed on macOS as per https://ci.brave.com/job/brave-browser-build-pr/job/pr5348-android-bg-ads-off-uplift-1.9.x/1/execution/node/672/log/. However, this is a known issue and will be fixed via brave/brave-browser#9480.

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels May 4, 2020
@gdregalo
Copy link
Contributor Author

gdregalo commented May 4, 2020

Please remove "CI/skip-android", add ""CI/skip-ios" and rebuild.

@kjozwiak kjozwiak added CI/skip-ios Do not run CI builds for iOS and removed CI/skip-android Do not run CI builds for Android labels May 4, 2020
@kjozwiak
Copy link
Member

kjozwiak commented May 4, 2020

Above only touches Android code so there's no need to get this passed on iOS.

kjozwiak
kjozwiak approved these changes May 4, 2020
View reviewed changes
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.9.x approved after deliberating with @brave/uplift-approvers. QA verified the PR on Nightly as per #5348 (comment).

@kjozwiak kjozwiak merged commit bb22dba into 1.9.x May 4, 2020
@kjozwiak kjozwiak deleted the pr5348-android-bg-ads-off-uplift-1.9.x branch May 4, 2020 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees
No one assigned
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64 feature/rewards
Projects
None yet
Milestone
1.9.x - Release
Development

Successfully merging this pull request may close these issues.
2 participants
@gdregalo @kjozwiak