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

Push domain exclusions to internal release #3195

Merged
merged 3 commits into from
Aug 7, 2024

Conversation

diegoreymendez
Copy link
Contributor

@diegoreymendez diegoreymendez commented Aug 6, 2024

Task/Issue URL: https://app.asana.com/0/0/1207987809385256/f

BSK PR: duckduckgo/BrowserServicesKit#928
macOS PR: duckduckgo/macos-browser#3076

Description

Integrates latest macOS BSK changes for supporting domain exclusions.

Testing

Ensure the VPN works well and check that nothing is broken.

Definition of Done:


Internal references:

Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation

diegoreymendez and others added 2 commits August 6, 2024 13:19
… iOS. (#3164)

Task/Issue URL: https://app.asana.com/0/0/1207936340790549/f

BSK PR: duckduckgo/BrowserServicesKit#918
macOS PR: duckduckgo/macos-browser#3045

## Description

Integrates latest macOS BSK changes for supporting domain exclusions.
9F69331B2C5A16E200CD6A5D /* OnboardingDaxFavouritesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F69331A2C5A16E200CD6A5D /* OnboardingDaxFavouritesTests.swift */; };
9F69331D2C5A191400CD6A5D /* MockTutorialSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F69331C2C5A191400CD6A5D /* MockTutorialSettings.swift */; };
9F6933192C59BB0300CD6A5D /* OnboardingPixelReporterMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9F6933182C59BB0300CD6A5D /* OnboardingPixelReporterMock.swift */; };
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why Xcode is moving this around, but nothing really changed.

@diegoreymendez
Copy link
Contributor Author

This was already reviewed in #3164, so I'll go the route we usually take and consider this a glorified cherry-pick with CI validation.

I've also tested this extensively, I'll do one more round of testing and merge if all looks good to me.

@diegoreymendez diegoreymendez merged commit 9b9ae1f into release/7.132.0 Aug 7, 2024
13 checks passed
@diegoreymendez diegoreymendez deleted the diego/exclude-domains-internal branch August 7, 2024 12:53
diegoreymendez added a commit to duckduckgo/macos-browser that referenced this pull request Aug 7, 2024
Task/Issue URL: https://app.asana.com/0/0/1207987809385256/f

BSK PR: duckduckgo/BrowserServicesKit#928
iOS PR: duckduckgo/iOS#3195

## Description

Implements domain exclusions for internal users only.
samsymons added a commit that referenced this pull request Aug 7, 2024
# By Mariusz Śpiewak (7) and others
# Via Diego Rey Mendez (1) and GitHub (1)
* main:
  Bump BSK to 181.1.0 (sets Privacy Dashboard to 5.0.0) (#3166)
  Animate transition between New Tab Page and tab switcher (#3196)
  Fix New Tab Page UI issues on iOS 15 (#3198)
  Push domain exclusions to internal release (#3195)
  Show shortcuts for enabled features only (#3193)
  Translate strings introduced in New Tab Page improvements (#3174)
  Update release workflow to use S3 bucket name from secrets (#3120)
  Handle contingency settings state on remote config (#3190)
  Add UI for displaying Duck Player contingency message #3065 (#3181)
  Open keyboard on New Tab Page based on Settings (#3187)
  Integrated macOS VPN Domain exclusion (internal release) changes into iOS. (#3164)
  Release 7.132.0-0 (#3194)
  Increase testPixelDebouncePreventsFiringWithinInterval test timeout (#3192)
  Update toolbar items for New Tab Page (#3185)
  new pixel and parameter for monitoring clearing of data stores (#3186)
  ensure new data clearing api is being used (#3191)
  If no App Store subscriptions option are available return empty options object (#3188)
  Show Intro message for existing users on New Tab Page (#3173)
  Experiment Contextual onboarding (#3160)

# Conflicts:
#	DuckDuckGo.xcodeproj/project.pbxproj
#	DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
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.

1 participant