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

allow first party subdomains when blocking 3rd-party cookies to match… (uplift to 1.7.x) #5331

Merged
merged 1 commit into from
Apr 27, 2020

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Apr 23, 2020

Uplift of #5318
Fixes brave/brave-browser#9337

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.

@bsclifton bsclifton added this to the 1.7.x - Release Hotfix 2 milestone Apr 23, 2020
@bsclifton bsclifton requested a review from a team April 23, 2020 00:00
@bsclifton bsclifton self-assigned this Apr 23, 2020
allow first party subdomains when blocking 3rd-party cookies to match…
@kjozwiak
Copy link
Member

Going to restart macOS as test-install failed as per https://ci.brave.com/job/brave-browser-build-pr/job/issue-9337-1.7.x/1/execution/node/635/log/.

06:43:38  + BROWSER='Brave Browser Nightly'
06:43:38  + BUILD_TYPE=Release
06:43:38  + SKIP_SIGNING=true
06:43:38  + OUT_DIR=/Users/jenkins/jenkins/workspace/rowser-build-pr_issue-9337-1.7.x/src/out/Release
06:43:38  + '[' true = true ']'
06:43:38  + hdiutil attach -nobrowse '/Users/jenkins/jenkins/workspace/rowser-build-pr_issue-9337-1.7.x/src/out/Release/unsigned_dmg/Brave Browser Nightly.dmg'
06:43:38  Checksumming Driver Descriptor Map (DDM : 0)…
06:43:38       Driver Descriptor Map (DDM : 0): verified   CRC32 $FFC85CD3
06:43:38  Checksumming Apple (Apple_partition_map : 1)…
06:43:38       Apple (Apple_partition_map : 1): verified   CRC32 $61CB2ECA
06:43:38  Checksumming DiscRecording 9.0.3d5 (Apple_HFS : 2)…
06:43:48  DiscRecording 9.0.3d5 (Apple_HFS : 2: verified   CRC32 $25D0EB10
06:43:48  verified   CRC32 $2E04CE12
06:43:48  /dev/disk2          	Apple_partition_scheme         	
06:43:48  /dev/disk2s1        	Apple_partition_map            	
06:43:48  /dev/disk2s2        	Apple_HFS                      	/Volumes/Brave Browser Nightly
06:43:48  + sleep 10
06:43:59  + open '/Volumes/Brave Browser Nightly/Brave Browser Nightly.app'
06:43:59  LSOpenURLsWithRole() failed with error -600 for the file /Volumes/Brave Browser Nightly/Brave Browser Nightly.app.

Even though this is an intermittent issue, looks like test-install never ran so going to restart as per the above.

@kjozwiak kjozwiak added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-linux labels Apr 24, 2020
@kjozwiak
Copy link
Member

QA verified #5318 on Nightly via desktop as per #5318 (comment).

However, it doesn't appear to be fixed on Android as per #5318 (comment), #5318 (comment) and #5318 (comment). The Android issue will be addressed in another issue once @jumde takes a look and creates the issue.

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.7.x approved after deliberating with @brave/uplift-approvers. Please make sure that all the correct labels are used and the associated issue is moved into the correct milestone.

@kjozwiak kjozwiak merged commit 56d4d1d into 1.7.x Apr 27, 2020
@kjozwiak kjozwiak deleted the issue-9337-1.7.x branch April 27, 2020 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants