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

3rd party cookie registry domains (uplift to 1.8.x) #5409

Merged
merged 1 commit into from
May 4, 2020

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Apr 28, 2020

This uplift excludes changes to browser/net/brave_network_delegate_browsertest.cc due to merge conflicts

Uplift of #5390
Fixes brave/brave-browser#9489

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.

3rd party cookie registry domains

This excludes changes to `browser/net/brave_network_delegate_browsertest.cc`
@bsclifton bsclifton added this to the 1.8.x - Release milestone Apr 28, 2020
@bsclifton bsclifton requested a review from a team April 28, 2020 16:43
@bsclifton bsclifton self-assigned this Apr 28, 2020
@bsclifton bsclifton removed the request for review from iefremov April 28, 2020 16:44
@kjozwiak
Copy link
Member

Looks like macOS failed due to test-install as per https://ci.brave.com/job/brave-browser-build-pr/job/3rd-party-cookie-registry-domains-1.8.x/1/execution/node/706/log/

15:39:04  + BROWSER='Brave Browser Nightly'
15:39:04  + BUILD_TYPE=Release
15:39:04  + SKIP_SIGNING=true
15:39:04  + OUT_DIR=/Users/jenkins/jenkins/workspace/ty-cookie-registry-domains-1.8.x/src/out/Release
15:39:04  + '[' true = true ']'
15:39:04  + hdiutil attach -nobrowse '/Users/jenkins/jenkins/workspace/ty-cookie-registry-domains-1.8.x/src/out/Release/unsigned_dmg/Brave Browser Nightly.dmg'
15:39:04  Checksumming Driver Descriptor Map (DDM : 0)…
15:39:04       Driver Descriptor Map (DDM : 0): verified   CRC32 $F046F102
15:39:04  Checksumming Apple (Apple_partition_map : 1)…
15:39:04       Apple (Apple_partition_map : 1): verified   CRC32 $219650C0
15:39:04  Checksumming DiscRecording 9.0.3d5 (Apple_HFS : 2)…
15:39:14  DiscRecording 9.0.3d5 (Apple_HFS : 2: verified   CRC32 $0D28C861
15:39:14  verified   CRC32 $71203619
15:39:15  /dev/disk2          	Apple_partition_scheme         	
15:39:15  /dev/disk2s1        	Apple_partition_map            	
15:39:15  /dev/disk2s2        	Apple_HFS                      	/Volumes/Brave Browser Nightly
15:39:15  + sleep 10
15:39:24  + open '/Volumes/Brave Browser Nightly/Brave Browser Nightly.app'
15:39:25  LSOpenURLsWithRole() failed with error -600 for the file /Volumes/Brave Browser Nightly/Brave Browser Nightly.app.

However, this is a known intermittent issue and doesn't need to block uplift.

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.8.x approved after deliberating with @brave/uplift-approvers. QA verified the PR on Nightly as per #5390 (comment) and #5390 (comment). Ensured that the correct labels are being used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit 93ec785 into 1.8.x May 4, 2020
@kjozwiak kjozwiak deleted the 3rd-party-cookie-registry-domains-1.8.x branch May 4, 2020 13:50
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