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 tooltips to show at the page load (uplift to 1.20.x) #7875

Merged
merged 1 commit into from
Feb 9, 2021

Conversation

brave-builds
Copy link
Collaborator

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

Uplift of #7862
Resolves brave/brave-browser#13995

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 8, 2021 20:47
@brave-builds brave-builds self-assigned this Feb 8, 2021
@brave-builds brave-builds added this to the 1.20.x - Release #2 milestone Feb 8, 2021
@kjozwiak
Copy link
Member

kjozwiak commented Feb 8, 2021

Restarting Linux as it failed to Check out from version control as per https://ci.brave.com/job/brave-core-build-pr-linux/job/PR-7875/1/execution/node/13/log/.

15:50:35  The recommended git tool is: git
15:50:35  using credential brave-builds-github-token-for-pr-builder
15:50:36  Cloning the remote Git repository
15:50:36  Using shallow clone with depth 1
15:50:36  Avoid fetching tags
15:50:36  Cloning repository https://github.com/brave/brave-core.git
15:50:36   > git init /var/lib/jenkins/jobs/brave-core-build-pr-linux/branches/PR-7875/workspace # timeout=10
15:50:36  Fetching upstream changes from https://github.com/brave/brave-core.git
15:50:36   > git --version # timeout=10
15:50:36   > git --version # 'git version 2.29.0'
15:50:36  using GIT_ASKPASS to set credentials brave-builds-github-token-for-pr-builder
15:50:36   > git fetch --no-tags --force --progress --depth=1 -- https://github.com/brave/brave-core.git +refs/heads/*:refs/remotes/origin/* # timeout=10
15:56:30   > git config remote.origin.url https://github.com/brave/brave-core.git # timeout=10
15:56:30   > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
15:56:31   > git config remote.origin.url https://github.com/brave/brave-core.git # timeout=10
15:56:31  Using shallow fetch with depth 1
15:56:31  Fetching upstream changes from https://github.com/brave/brave-core.git
15:56:31  using GIT_ASKPASS to set credentials brave-builds-github-token-for-pr-builder
15:56:31   > git fetch --no-tags --force --progress --depth=1 -- https://github.com/brave/brave-core.git +refs/pull/7875/head:refs/remotes/origin/PR-7875 # timeout=10
15:56:33  Checking out Revision efd150ba049d6aa4a6d16478ddeb9a871c266b09 (PR-7875)
15:56:33   > git config core.sparsecheckout # timeout=10
15:56:33   > git checkout -f efd150ba049d6aa4a6d16478ddeb9a871c266b09 # timeout=10

@kjozwiak
Copy link
Member

kjozwiak commented Feb 9, 2021

test-browser failed on macOS due to RewardsBrowserTest.ResetReward failing as per https://ci.brave.com/job/pr-brave-browser-pr7862_show_tooltips_on_page_load_android_1.20.x-macos/1/execution/node/237/log/. However, the failure isn't related to this specific PR. Created brave/brave-browser#14047.

17:59:21  1 test failed:
17:59:21      RewardsBrowserTest.ResetRewards (../../brave/components/brave_rewards/browser/test/rewards_browsertest.cc:358)

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 #7862 (comment).

@kjozwiak kjozwiak merged commit 1f43436 into 1.20.x Feb 9, 2021
@kjozwiak kjozwiak deleted the pr7862_show_tooltips_on_page_load_android_1.20.x branch February 9, 2021 04:14
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