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

Fixes Brave Ads fails to upgrade segment database table from 1.19.x to 1.20.x and above - 1.20.x #7679

Merged
merged 1 commit into from
Jan 29, 2021

Conversation

tmancey
Copy link
Collaborator

@tmancey tmancey commented Jan 22, 2021

Uplift of #7678
Resolves brave/brave-browser#13719

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

@tmancey tmancey requested a review from a team January 22, 2021 11:42
@tmancey tmancey self-assigned this Jan 22, 2021
@tmancey tmancey changed the title Fixes Brave Ads fails to upgrade segment database table from 1.19.x to 1.20.x and 1.21.x - 1.20.x Fixes Brave Ads fails to upgrade segment database table from 1.19.x to 1.20.x and above - 1.20.x Jan 22, 2021
@tmancey tmancey force-pushed the issues/13719-1.20.x branch from 126fd5a to 44881b2 Compare January 22, 2021 12:15
@tmancey tmancey added this to the 1.20.x - Beta milestone Jan 22, 2021
@tmancey tmancey force-pushed the issues/13719-1.20.x branch from 44881b2 to 63428d8 Compare January 23, 2021 10:35
@kjozwiak
Copy link
Member

Looks like there was a few lint errors when running post-init as per https://ci.brave.com/blue/rest/organizations/jenkins/pipelines/pr-brave-browser-issues-13719-1.20.x-post-init/runs/4/nodes/113/log/?start=0.

[2021-01-23T11:04:34.594Z] Running cpplint...
[2021-01-23T11:04:34.594Z] Skipping file components/brave_ads/test/BUILD.gn
[2021-01-23T11:04:34.594Z] vendor/bat-native-ads/src/bat/ads/internal/database/tables/ad_events_database_table_unittest.cc:23:  Add #include <memory> for unique_ptr<>  [build/include_what_you_use] [4]
[2021-01-23T11:04:34.594Z] Done processing vendor/bat-native-ads/src/bat/ads/internal/database/tables/ad_events_database_table_unittest.cc
[2021-01-23T11:04:34.594Z] vendor/bat-native-ads/src/bat/ads/internal/database/tables/campaigns_database_table_unittest.cc:23:  Add #include <memory> for unique_ptr<>  [build/include_what_you_use] [4]
[2021-01-23T11:04:34.594Z] Done processing vendor/bat-native-ads/src/bat/ads/internal/database/tables/campaigns_database_table_unittest.cc
[2021-01-23T11:04:34.594Z] vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_ads_database_table_unittest.cc:23:  Add #include <memory> for unique_ptr<>  [build/include_what_you_use] [4]
[2021-01-23T11:04:34.594Z] Done processing vendor/bat-native-ads/src/bat/ads/internal/database/tables/creative_ads_database_table_unittest.cc
[2021-01-23T11:04:34.594Z] vendor/bat-native-ads/src/bat/ads/internal/database/tables/dayparts_database_table_unittest.cc:23:  Add #include <memory> for unique_ptr<>  [build/include_what_you_use] [4]
[2021-01-23T11:04:34.594Z] Done processing vendor/bat-native-ads/src/bat/ads/internal/database/tables/dayparts_database_table_unittest.cc
[2021-01-23T11:04:34.594Z] vendor/bat-native-ads/src/bat/ads/internal/database/tables/geo_targets_database_table_unittest.cc:23:  Add #include <memory> for unique_ptr<>  [build/include_what_you_use] [4]
[2021-01-23T11:04:34.594Z] Done processing vendor/bat-native-ads/src/bat/ads/internal/database/tables/geo_targets_database_table_unittest.cc
[2021-01-23T11:04:34.594Z] Done processing vendor/bat-native-ads/src/bat/ads/internal/database/tables/segments_database_table.cc
[2021-01-23T11:04:34.594Z] vendor/bat-native-ads/src/bat/ads/internal/database/tables/segments_database_table_unittest.cc:23:  Add #include <memory> for unique_ptr<>  [build/include_what_you_use] [4]
[2021-01-23T11:04:34.594Z] Done processing vendor/bat-native-ads/src/bat/ads/internal/database/tables/segments_database_table_unittest.cc
[2021-01-23T11:04:34.594Z] Skipping clang/gn format check because base_branch is origin/1.20.x instead of refs/remotes/origin/master
[2021-01-23T11:04:34.594Z] cpplint errors found: 6

@tmancey tmancey force-pushed the issues/13719-1.20.x branch from 63428d8 to 58c3e3e Compare January 26, 2021 18:24
@tmancey
Copy link
Collaborator Author

tmancey commented Jan 26, 2021

@kjozwiak Fixed linter issues and merged

@kjozwiak
Copy link
Member

kjozwiak commented Jan 26, 2021

test-browser failed on macOS due to RewardsPromotionBrowserTest.ClaimViaPanel failing as per the following:

[2021-01-26T20:07:13.834Z] [  FAILED  ] RewardsPromotionBrowserTest.ClaimViaPanel, where TypeParam =  and GetParam() =  (31052 ms)
[2021-01-26T20:07:13.834Z] [669/669] RewardsPromotionBrowserTest.ClaimViaPanel (31143 ms)
[2021-01-26T20:07:13.834Z] 1 test failed:
[2021-01-26T20:07:13.834Z]     RewardsPromotionBrowserTest.ClaimViaPanel (../../brave/components/brave_rewards/browser/test/rewards_promotion_browsertest.cc:204)

However, this is a known intermittent issue as per brave/brave-browser#12605 and doesn't block uplift.

Restarting Win as dist failed as per https://ci.brave.com/job/pr-brave-browser-issues-13719-1.20.x-windows/5/execution/node/227/log/.

Restarting pre-init as test-unit failed as per https://ci.brave.com/job/pr-brave-browser-issues-13719-1.20.x-pre-init/4/execution/node/113/log/.

@kjozwiak kjozwiak mentioned this pull request Jan 26, 2021
23 tasks
@kjozwiak
Copy link
Member

@tmancey mind taking a look at this one? It keeps failing Win:

23:28:12  SignTool Error: No certificates were found that met all the given criteria.
23:28:12  scons: *** [scons-out\opt-win\obj\google_update\BraveUpdate_signed.exe] Error 1
23:28:12  scons: building terminated because of errors.
23:28:12  Traceback (most recent call last):
23:28:12    File "../../brave/vendor/omaha/build_omaha.py", line 200, in <module>
23:28:12      sys.exit(Main(sys.argv))
23:28:12    File "../../brave/vendor/omaha/build_omaha.py", line 193, in Main
23:28:12      Tagging(args, omaha_dir, False)
23:28:12    File "../../brave/vendor/omaha/build_omaha.py", line 130, in Tagging
23:28:12      sp.check_call(command, stderr=sp.STDOUT)
23:28:12    File "C:\20.x\src\brave\vendor\depot_tools\bootstrap-3_8_0_chromium_8_bin\python\bin\lib\subprocess.py", line 185, in check_call
23:28:12      retcode = call(*popenargs, **kwargs)
23:28:12    File "C:\20.x\src\brave\vendor\depot_tools\bootstrap-3_8_0_chromium_8_bin\python\bin\lib\subprocess.py", line 172, in call
23:28:12      return Popen(*popenargs, **kwargs).wait()
23:28:12    File "C:\20.x\src\brave\vendor\depot_tools\bootstrap-3_8_0_chromium_8_bin\python\bin\lib\subprocess.py", line 394, in __init__
23:28:12      errread, errwrite)
23:28:12    File "C:\20.x\src\brave\vendor\depot_tools\bootstrap-3_8_0_chromium_8_bin\python\bin\lib\subprocess.py", line 644, in _execute_child
23:28:12      startupinfo)
23:28:12  WindowsError: [Error 2] The system cannot find the file specified
23:28:12  ninja: build stopped: subcommand failed.
23:28:12  null
23:28:12  powershell.exe : null
23:28:12  At C:\20.x@tmp\durable-b3677b15\powershellWrapper.ps1:3 char:1
23:28:12  + & powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -Comm ...
23:28:12  + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
23:28:12      + CategoryInfo          : NotSpecified: (null:String) [], RemoteException
23:28:12      + FullyQualifiedErrorId : NativeCommandError

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 also verified the PR on Nightly as per #7678 (comment).

@kjozwiak kjozwiak merged commit a1c2dda into 1.20.x Jan 29, 2021
@kjozwiak kjozwiak deleted the issues/13719-1.20.x branch January 29, 2021 00:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants