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

[Uplift to 1.5] Make ntp si component support android #4973

Merged
merged 1 commit into from
Mar 18, 2020

Conversation

simonhong
Copy link
Member

@simonhong simonhong commented Mar 17, 2020

Uplift #4784 (#4787) is already in beta.
This uplift is needed for uplifting #4807

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.

@simonhong simonhong added this to the 1.5.x milestone Mar 17, 2020
@simonhong simonhong requested a review from a team March 17, 2020 23:30
@simonhong simonhong requested a review from petemill as a code owner March 17, 2020 23:30
@simonhong simonhong self-assigned this Mar 17, 2020
@simonhong simonhong changed the title Merge pull request #4784 from brave/ntp_sponsored_images_android [Uplift to 1.5] Make ntp si component support android Mar 17, 2020
@simonhong simonhong modified the milestones: 1.5.x, 1.5.x - Release Mar 17, 2020
@simonhong
Copy link
Member Author

CI has two below errors. I think those two errors are not related with this PR. (maybe Builder's temporal error?)
All tests on all platforms are passed.

The one is from https://ci.brave.com/job/brave-browser-build-pr/job/uplift_4784_1_5/1/execution/node/647/log/

13:27:40  INFO: Starting to record.
13:27:40  INFO: Processing GoogleTest-1.8
13:27:51  INFO: [GoogleTest-1.8] - 1 test report file(s) were found with the pattern 'src/brave_unit_tests.xml' relative to '/Users/jenkins/jenkins/workspace/browser-build-pr_uplift_4784_1_5' for the testing framework 'GoogleTest-1.8'.

The other is from https://ci.brave.com/job/brave-browser-build-pr/job/uplift_4784_1_5/1/execution/node/665/log/

13:32:51  INFO: Starting to record.
13:32:51  INFO: Processing GoogleTest-1.8
13:32:52  INFO: [GoogleTest-1.8] - 1 test report file(s) were found with the pattern 'src/brave_browser_tests.xml' relative to '/Users/jenkins/jenkins/workspace/browser-build-pr_uplift_4784_1_5' for the testing framework 'GoogleTest-1.8'.

@kjozwiak
Copy link
Member

@simonhong it's a known intermittent issue. We usually don't block PR uplifts due to Publish xUnit failing for both test-unit and test-browser 👍

Travis is failing TEST_SUITE=test-security due to the minimist npm package being vulnerable. It's a known issue as per brave/brave-browser#8722 and doesn't block the PR from being uplifted.

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.5.x approved after deliberating with @brave/uplift-approvers. As per #4973 (comment), Travis failed due to TEST_SUITE=test-security because of minimist which is a known issue and highlighted via brave/brave-browser#8722. Publish xUnit also failed for both test-unit and test-browser as per #4973 (comment). However, this is a known intermittent issue as well and not a blocker.

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 b762f40 into 1.5.x Mar 18, 2020
@kjozwiak kjozwiak deleted the uplift_4784_1_5 branch March 18, 2020 05:46
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