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

feat: cherrypick commits from main branch #183

Merged
merged 5 commits into from
Nov 29, 2022

Conversation

alex-barstow
Copy link
Contributor

@alex-barstow alex-barstow commented Nov 22, 2022

There is a bug in 4.x+ where Fairplay tends to fail. It has something to do with the #142 that added support for in-spec EME in Safari.

We will work on diagnosing that issue, but in the meantime we can tag off the 3.x branch before the problem was introduced. There were a few changes in #main that we wanted to get released promptly. This PR includes those changes as well as every non-breaking change since 3.10.1.

@alex-barstow
Copy link
Contributor Author

Probably shouldn't squash this one

misteroneill
misteroneill previously approved these changes Nov 29, 2022
Copy link
Member

@misteroneill misteroneill left a comment

Choose a reason for hiding this comment

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

Looks good. Agree on not squashing.

Copy link
Member

@misteroneill misteroneill left a comment

Choose a reason for hiding this comment

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

Let's do that (we can enable for this repo temporarily). But we should rebase out the "Revert" commit and the commit it reverts first so as not to pollute the CHANGELOG.

@alex-barstow alex-barstow merged commit a795519 into 3.x Nov 29, 2022
@alex-barstow alex-barstow deleted the cherrypick-commits-from-main branch November 29, 2022 21:35
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.

None yet

5 participants