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

Backport mu-wpcom-plugin 2.1.27, jetpack 13.5-a.3 Changes #37456

Merged
merged 2 commits into from
May 20, 2024
Merged

Backport mu-wpcom-plugin 2.1.27, jetpack 13.5-a.3 Changes #37456

merged 2 commits into from
May 20, 2024

Conversation

tbradsha
Copy link
Contributor

Proposed changes:

Backports changes for mu-wpcom-plugin 2.1.27, jetpack 13.5-a.3

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

N/a

Does this pull request change what data or activity we track or use?

No

Testing instructions:

Proofread changes.

@tbradsha tbradsha added the [Status] Needs Review To request a review from Crew. Label will be renamed soon. label May 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 20, 2024 •
edited

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the prerelease branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack prerelease

    bin/jetpack-downloader test jetpack-mu-wpcom-plugin prerelease

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@tbradsha tbradsha self-assigned this May 20, 2024
@tbradsha tbradsha requested a review from a team May 20, 2024 18:11
@github-actions github-actions bot added [Package] Scheduled Updates [Package] Search Contains core Search functionality for Jetpack and Search plugins [Package] Stats Admin [Package] Status [Package] Sync [Package] VideoPress [Package] WAF [Package] WooCommerce Analytics Enhanced analytics for WooCommerce users [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] mu wpcom jetpack-mu-wpcom plugin Docs RNA labels May 20, 2024
@github-actions GitHub Actions
Copy link
Contributor

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.

Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

  • WordPress.com Simple releases happen daily.
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for June 4, 2024 (scheduled code freeze on June 3, 2024).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Mu Wpcom plugin:

  • Next scheduled release: June 4, 2024.
  • Scheduled code freeze: May 27, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

ice9js
ice9js previously approved these changes May 20, 2024
View reviewed changes
Copy link
Member

@ice9js ice9js left a comment

Choose a reason for hiding this comment

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

Hmm, I added some minor comments in case you'd want to address them here, but also ok with merging as is and fixing separately or later when we do the actual release - as long as we don't forget it's fine.

projects/plugins/jetpack/CHANGELOG.md
@@ -2,6 +2,37 @@

### This is a list detailing changes for all Jetpack releases.

## 13.5-a.3 - 2024-05-20
### Enhancements
- AI Assistant: Enable inline Heading extension. [#37386]
Copy link
Member

Choose a reason for hiding this comment

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

Is the capitalized 'Heading' intended?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it's referring to the Heading block.

projects/plugins/jetpack/CHANGELOG.md Outdated
## 13.5-a.3 - 2024-05-20
### Enhancements
- AI Assistant: Enable inline Heading extension. [#37386]
- Subscribe block: Adds button-only style. [#37341]
Copy link
Member

Choose a reason for hiding this comment

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

'Adds' -> 'Add' for consistency?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

8ad72ba

projects/plugins/jetpack/CHANGELOG.md Outdated
### Enhancements
- AI Assistant: Enable inline Heading extension. [#37386]
- Subscribe block: Adds button-only style. [#37341]
- Subscribe block: Allow inside navigation block. [#37439]
Copy link
Member

Choose a reason for hiding this comment

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

Hmm... shouldn't it be 'navigation inside the block' instead of 'inside navigation block' ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In this case it literally is referring to adding the Subscription block as a child of the Navigation block (#37439). I tweaked it a bit in 8ad72ba but open to suggestions!

Copy link
Member

Choose a reason for hiding this comment

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

Oh, I see, yeah, I think it makes more sense now. Could eventually maybe write it out to something like "Allow to be placed inside the Navigation block" or something. 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, my first iteration was "Allow insertion in Navigation block." but that sounded too technical. Your version is pretty good; we can use that in the next release.

projects/plugins/jetpack/CHANGELOG.md Outdated
- Block Editor: Remove External Link icon styling fix now that the change has been made in WordPress itself. [#37394]

### Bug fixes
- Slideshow: Fix className issue on frontend - ensures autoplay works properly. [#37378]
Copy link
Member

Choose a reason for hiding this comment

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

Nit: we could also fix it later when we do the actual release but just quickly flagging it. I think the first part of the sentence is somewhat unnecessary for the purpose of a plugin changelog?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

8ad72ba

projects/plugins/jetpack/CHANGELOG.md Outdated

### Bug fixes
- Slideshow: Fix className issue on frontend - ensures autoplay works properly. [#37378]
- WordAds: Prevent fatal when post content is null. [#37384]
Copy link
Member

Choose a reason for hiding this comment

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

'fatal' -> 'fatal errors'?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

8ad72ba

ice9js
ice9js approved these changes May 20, 2024
View reviewed changes
Copy link
Member

@ice9js ice9js left a comment

Choose a reason for hiding this comment

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

👍

@tbradsha tbradsha merged commit 78d4035 into trunk May 20, 2024
74 of 76 checks passed
@tbradsha tbradsha deleted the prerelease branch May 20, 2024 19:07
@github-actions github-actions bot removed the [Status] Needs Review To request a review from Crew. Label will be renamed soon. label May 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ice9js ice9js ice9js approved these changes

Assignees

@tbradsha tbradsha

Labels
Docs [Feature] Contact Form [Feature] Photon aka "Image CDN". Feature developed in the Image CDN package and shipped in multiple plugins [Feature] SSO [Feature] Subscriptions All subscription-related things such as paid and unpaid, user management, and newsletter settings. [Feature] WooCommerce Analytics [JS Package] AI Client [JS Package] Connection [JS Package] Licensing [JS Package] Partner Coupon [JS Package] Publicize Components [JS Package] Shared Extension Utils [Package] Ad aka WordAds [Package] Assets [Package] Backup [Package] Blaze [Package] Blocks [Package] Connection [Package] Forms [Package] Identity Crisis [Package] Image CDN [Package] Jetpack mu wpcom WordPress.com Features [Package] Logo [Package] My Jetpack [Package] Plugins Installer [Package] Publicize [Package] Scheduled Updates [Package] Search Contains core Search functionality for Jetpack and Search plugins [Package] Stats Admin [Package] Status [Package] Sync [Package] VideoPress [Package] WAF [Package] WooCommerce Analytics Enhanced analytics for WooCommerce users [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] mu wpcom jetpack-mu-wpcom plugin RNA
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@tbradsha @ice9js