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

In app callout android (uplift to 1.20.x) #7755

Merged
merged 1 commit into from
Feb 4, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Feb 1, 2021

Uplift of #7715
Resolves brave/brave-browser#12209

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 February 1, 2021 04:39
@brave-builds brave-builds self-assigned this Feb 1, 2021
@brave-builds brave-builds added this to the 1.20.x - Beta milestone Feb 1, 2021
@kjozwiak
Copy link
Member

kjozwiak commented Feb 2, 2021

Win failed due to gn-check as per the following.

Cannot run program "nohup" (in directory "C:\20.x"): CreateProcess error=2, The system cannot find the file specified

However, this is a known issue that has already been fixed by @mihaiplesa via https://github.com/brave/devops/pull/4339 and doesn't block uplift.

macOS failed test-browser as per https://ci.brave.com/job/pr-brave-browser-pr7715_in_app_callout_android_1.20.x-macos/1/execution/node/221/log/. However, these are known intermittent issues as per brave/brave-browser#13883 & brave/brave-browser#13884.

01:17:19  2 tests failed:
01:17:19      RewardsContributionBrowserTest.SplitProcessOneTimeTip (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:894)
01:17:19      RewardsContributionBrowserTest.SplitProcessorAutoContribution (../../brave/components/brave_rewards/browser/test/rewards_contribution_browsertest.cc:758)

test-browser failed on Linux due to RewardsBrowserTest.SiteBannerDefaultPublisherAmounts failing as per https://ci.brave.com/job/pr-brave-browser-pr7715_in_app_callout_android_1.20.x-linux/1/execution/node/221/log/. Created brave/brave-browser#13885 to address the issue. However, the crash isn't related to this specific PR and doesn't block uplift.

01:03:54  1 test crashed:
01:03:54      RewardsBrowserTest.SiteBannerDefaultPublisherAmounts (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:181)

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

@kjozwiak kjozwiak requested review from kjozwiak and a team and removed request for kjozwiak February 3, 2021 08:01
@kjozwiak
Copy link
Member

kjozwiak commented Feb 3, 2021

@deeppandya mind rebasing? We landed 88.0.4324.146 so assuming that's causing Android to fail init as per https://ci.brave.com/job/pr-brave-browser-pr7715_in_app_callout_android_1.20.x-android/2/execution/node/122/log/:

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

@deeppandya deeppandya force-pushed the pr7715_in_app_callout_android_1.20.x branch from deafc59 to 1fd5186 Compare February 3, 2021 20:58
@deeppandya deeppandya force-pushed the pr7715_in_app_callout_android_1.20.x branch from 1fd5186 to 588116d Compare February 3, 2021 23:24
@kjozwiak kjozwiak merged commit 8a8f715 into 1.20.x Feb 4, 2021
@kjozwiak kjozwiak deleted the pr7715_in_app_callout_android_1.20.x branch February 4, 2021 05:53
@kjozwiak kjozwiak removed the request for review from a team February 4, 2021 05:54
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