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.

Sign up for GitHub

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

Jump to bottom

Bump BSK to pull in C-S-S 6.19.0 #3396

Merged
merged 7 commits into from
Sep 26, 2024
Merged

Bump BSK to pull in C-S-S 6.19.0 #3396

merged 7 commits into from
Sep 26, 2024

Conversation

dharb
Copy link
Collaborator

@dharb dharb commented Sep 25, 2024 •
edited
Loading

Task/Issue URL: https://app.asana.com/0/72649045549333/1207836782368194/f
Tech Design URL: https://app.asana.com/0/72649045549333/1207836782368196/f
Corresponding BSK PR: duckduckgo/BrowserServicesKit#1006
Corresponding macOS PR: duckduckgo/macos-browser#3347

CC: @jonathanKingston

Description:
This PR bumps the BSK pin to pull in the changes from duckduckgo/content-scope-scripts#1026.

Steps to test this PR:

  1. Navigate to any old MSN article page and refresh the page two or more times. See that the Expand Article button persists across reloads.

Definition of Done (Internal Only):

Copy Testing:

  • Use of correct apostrophes in new copy, ie ’ rather than '

Orientation Testing:

  • Portrait
  • Landscape

Device Testing:

  • iPhone SE (1st Gen)
  • iPhone 8
  • iPhone X
  • iPhone 14 Pro
  • iPad

OS Testing:

  • iOS 15
  • iOS 16
  • iOS 17

Theme Testing:

  • Light theme
  • Dark theme
Internal references:

Software Engineering Expectations
Technical Design Template

@dharb dharb mentioned this pull request Sep 25, 2024
Merged
6 tasks
@dharb dharb mentioned this pull request Sep 25, 2024
Merged
1 task
afterxleep
afterxleep approved these changes Sep 25, 2024
View reviewed changes
Copy link
Collaborator

@afterxleep afterxleep left a comment

Choose a reason for hiding this comment

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

:shipit:

dharb added a commit to duckduckgo/BrowserServicesKit that referenced this pull request Sep 25, 2024
@dharb
Bump C-S-S to 6.19.0 (#1006)
5b59c27 
<!--
Note: This checklist is a reminder of our shared engineering
expectations.
-->

Please review the release process for BrowserServicesKit
[here](https://app.asana.com/0/1200194497630846/1200837094583426).

**Required**:

Task/Issue URL:
https://app.asana.com/0/72649045549333/1207836782368194/f
iOS PR: duckduckgo/iOS#3396
macOS PR: duckduckgo/macos-browser#3347
What kind of version bump will this require?: Minor

**Optional**:

Tech Design URL:
https://app.asana.com/0/72649045549333/1207836782368196/f
CC: @jonathanKingston 

**Description**:
This PR bumps the C-S-S pin to pull in the changes from
duckduckgo/content-scope-scripts#1026.

<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

**Steps to test this PR**:
1. Navigate to any old [MSN article
page](https://www.msn.com/en-us/sports/nfl/how-saquon-barkley-gave-eagles-coach-a-hard-lesson-in-accountability-while-saving-season/ar-AA1qPl89?ocid=hpmsn&cvid=81d6bc9eb97e442ba7de62c248189b23&ei=12)
and refresh the page two or more times. See that the `Expand Article`
button persists across reloads.

<!--
Before submitting a PR, please ensure you have tested the combinations
you expect the reviewer to test, then delete configurations you *know*
do not need explicit testing.

Using a simulator where a physical device is unavailable is acceptable.
-->

**OS Testing**:

* [ ] iOS 14
* [ ] iOS 15
* [ ] iOS 16
* [ ] macOS 10.15
* [ ] macOS 11
* [ ] macOS 12

---
###### Internal references:
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
federicocappelli
federicocappelli approved these changes Sep 26, 2024
View reviewed changes
Copy link
Member

@federicocappelli federicocappelli left a comment

Choose a reason for hiding this comment

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

LGTM, feel free to merge

@dharb dharb merged commit e17d889 into main Sep 26, 2024
13 checks passed
@dharb dharb deleted the dharb/bump-bsk branch September 26, 2024 15:46
dharb added a commit to duckduckgo/macos-browser that referenced this pull request Sep 26, 2024
@dharb
Bump BSK to pull in C-S-S 6.19.0 (#3347)
49382c6 
Task/Issue URL:
https://app.asana.com/0/72649045549333/1207836782368194/f
Tech Design URL:
https://app.asana.com/0/72649045549333/1207836782368196/f
Corresponding BSK PR:
duckduckgo/BrowserServicesKit#1006
Corresponding iOS PR: duckduckgo/iOS#3396
CC:

**Description**:
This PR bumps the BSK pin to pull in the changes from
duckduckgo/content-scope-scripts#1026. This
feature is not active on desktop platforms, so no changes to be tested
from this PR.


<!--
Tagging instructions
If this PR isn't ready to be merged for whatever reason it should be
marked with the `DO NOT MERGE` label (particularly if it's a draft)
If it's pending Product Review/PFR, please add the `Pending Product
Review` label.

If at any point it isn't actively being worked on/ready for
review/otherwise moving forward (besides the above PR/PFR exception)
strongly consider closing it (or not opening it in the first place). If
you decide not to close it, make sure it's labelled to make it clear the
PRs state and comment with more information.
-->

**Definition of Done**:

* [ ] Does this PR satisfy our [Definition of
Done](https://app.asana.com/0/1202500774821704/1207634633537039/f)?

---
###### Internal references:
[Pull Request Review
Checklist](https://app.asana.com/0/1202500774821704/1203764234894239/f)
[Software Engineering
Expectations](https://app.asana.com/0/59792373528535/199064865822552)
[Technical Design
Template](https://app.asana.com/0/59792373528535/184709971311943)
[Pull Request
Documentation](https://app.asana.com/0/1202500774821704/1204012835277482/f)
samsymons added a commit that referenced this pull request Sep 28, 2024
@samsymons
Merge branch 'main' into sam/persistent-pixels
c772efa 
# By Daniel Bernal (12) and others
# Via Daniel Bernal (5) and others
* main: (46 commits)
  Release 7.139.0-4 (#3411)
  Onboarding highlights experiment updates (#3406)
  fix suggestions performance (#3405)
  For third party requests differentiate if they are affiliated with first party (#3386)
  Bump BSK to pull in C-S-S 6.19.0 (#3396)
  Release 7.139.0-3 (#3399)
  Onboarding Highlights Ship Review  (#3380)
  add assertions for tabs in suggestions (#3394)
  Release 7.139.0-2 (#3398)
  Bump BSK to Include C.S.S 6.17 (#3397)
  Bump BSK which includes C.S.S 6.17 (#3395)
  Rever BSK branch
  Revert "Bump C.S.S"
  Bump C.S.S
  translations for Switch to Tab (#3391)
  Remove Favorites section header from NTP (#3381)
  Release 7.139.0-1 (#3389)
  Add origin to /apps URL (#3378)
  chery pick returning user fix
  Release 7.138.1-0 (#3388)
  ...

# Conflicts:
#	DuckDuckGo/AppDependencyProvider.swift
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@federicocappelli federicocappelli federicocappelli approved these changes

@afterxleep afterxleep afterxleep approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dharb @afterxleep @federicocappelli