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

Fix 10269: Do not proxy downloads for Widevine (uplift to 1.10.x) #5874

Merged
merged 1 commit into from
Jun 17, 2020

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Jun 16, 2020

Uplift of #5846
Resolves brave/brave-browser#10269

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 June 16, 2020 23:08
@brave-builds brave-builds self-assigned this Jun 16, 2020
@brave-builds brave-builds added this to the 1.10.x - Release milestone Jun 16, 2020
@kjozwiak
Copy link
Member

Looks like npm run audit_deps failed on every platform as per the following:

19:37:58  /home/ubuntu/workspace/pr-brave-browser-pr5846_widevine_download_exception_1.10.x: python /home/ubuntu/workspace/pr-brave-browser-pr5846_widevine_download_exception_1.10.x/src/brave/script/audit_deps.py
19:37:59  
19:37:59  Traceback (most recent call last):
19:37:59    File "/home/ubuntu/workspace/pr-brave-browser-pr5846_widevine_download_exception_1.10.x/src/brave/script/audit_deps.py", line 66, in <module>
19:37:59      sys.exit(main())
19:37:59    File "/home/ubuntu/workspace/pr-brave-browser-pr5846_widevine_download_exception_1.10.x/src/brave/script/audit_deps.py", line 15, in main
19:37:59      return audit_deps(args)
19:37:59    File "/home/ubuntu/workspace/pr-brave-browser-pr5846_widevine_download_exception_1.10.x/src/brave/script/audit_deps.py", line 35, in audit_deps
19:37:59      resolutions = result['actions'][0]['resolves']
19:37:59  IndexError: list index out of range

This is a known issue and is being looked investigated. However, it doesn't block uplift.

Also looks like test-browser failed on macOS as per https://ci.brave.com/job/pr-brave-browser-pr5846_widevine_download_exception_1.10.x/1/execution/node/589/log/:

20:34:22  [  FAILED  ] BraveRewardsBrowserTest.NotVerifiedWallet, where TypeParam =  and GetParam() =  (6236 ms)
20:34:22  [567/567] BraveRewardsBrowserTest.NotVerifiedWallet (6346 ms)
20:34:22  1 test failed:
20:34:22      BraveRewardsBrowserTest.NotVerifiedWallet (../../brave/components/brave_rewards/browser/rewards_service_browsertest.cc:2433)

However, the above failure is known and was fixed via brave/brave-browser#9339 which is currently in 1.11.x.

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.10.x approved after deliberating with @brave/uplift-approvers. QA also verified the issue on Nightly as per #5846 (comment).

@kjozwiak kjozwiak merged commit 46b1d54 into 1.10.x Jun 17, 2020
@kjozwiak kjozwiak deleted the pr5846_widevine_download_exception_1.10.x branch June 17, 2020 06:43
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