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

Plans: use the Jetpack Plans package in the Jetpack plugin, and deprecate existing class #31213

Merged
merged 19 commits into from
Jun 16, 2023

Conversation

jeherve
Copy link
Member

@jeherve jeherve commented Jun 6, 2023

Fixes #31213

Proposed changes:

In this PR, we start using the package in the Jetpack plugin, and deprecate the existing class. No features should be impacted by the change, everything should work just like before.

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

  • pdWQjU-4i-p2
  • p9dueE-7pi-p2
  • 1202726932197503-as-1202726932197515

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

  • No

Testing instructions:

Lots of things to test here. I would also recommend tailing the site's logs as you test, to ensure no calls of Jetpack_Plan (now returning deprecation notices) remains.

  • Start by connecting your site to WordPress.com.
  • Check all the features where files are touched.

@jeherve jeherve self-assigned this Jun 6, 2023
@github-actions github-actions bot added [Block] Tiled Gallery [Package] Plans [Package] Stats Admin [Package] Status [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations Pay With Paypal [Feature] SEO Tools Tools for improving a site's search engine optimization. [Feature] Stats Data Feature that enables users to track their site's traffic and gain insights on popular content. [Feature] VideoPress A feature to help you upload and insert videos on your site. labels Jun 6, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2023

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.
  • ⚠️ All commits were linted before commit.
  • ✅ 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 (other than "Required review") 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:

  • Next scheduled release: July 5, 2023.
  • Scheduled code freeze: June 26, 2023.

@github-actions
Copy link
Contributor

github-actions bot commented Jun 6, 2023

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 plugin. Once the plugin is active, go to Jetpack > Jetpack Beta > Jetpack and enable the rm/jetpack-plan-current-plan branch.

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

    bin/jetpack-downloader test jetpack rm/jetpack-plan-current-plan
    

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

Base automatically changed from update/current-plan to trunk June 8, 2023 11:46
@jeherve jeherve added [Status] Needs Review To request a review from Crew. Label will be renamed soon. and removed [Status] In Progress labels Jun 9, 2023
anomiex
anomiex previously approved these changes Jun 14, 2023
Copy link
Contributor

@anomiex anomiex left a comment

Choose a reason for hiding this comment

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

Looks ok, diffing trunk projects/plugins/jetpack/class.jetpack-plan.php and projects/packages/plans/src/class-current-plan.php shows minimal differences and some quick poking around with this on wpcom didn't blow up.

Not sure what's going on with all the failing E2E tests.

projects/plugins/jetpack/class.jetpack-plan.php Outdated Show resolved Hide resolved
@anomiex anomiex added [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! and removed [Status] Needs Review To request a review from Crew. Label will be renamed soon. labels Jun 14, 2023
@jeherve jeherve added [Status] Needs Review To request a review from Crew. Label will be renamed soon. and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Jun 15, 2023
Copy link
Contributor

@anomiex anomiex left a comment

Choose a reason for hiding this comment

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

Glad I decided to poke at the E2E failures, found a bug.

Also this needs a version bump now.

projects/packages/status/src/class-modules.php Outdated Show resolved Hide resolved
jeherve and others added 2 commits June 15, 2023 15:26
Co-authored-by: Brad Jorsch <anomiex@users.noreply.github.com>
@jeherve jeherve merged commit 74c8590 into trunk Jun 16, 2023
56 of 57 checks passed
@jeherve jeherve deleted the rm/jetpack-plan-current-plan branch June 16, 2023 12:50
@github-actions github-actions bot removed [Status] Needs Review To request a review from Crew. Label will be renamed soon. [Status] In Progress labels Jun 16, 2023
@github-actions github-actions bot added this to the jetpack/12.3 milestone Jun 16, 2023
@jeherve jeherve added the [Feature] Pay with PayPal aka Simple Payments label Aug 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Block] Tiled Gallery E2E Tests [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations [Feature] Pay with PayPal aka Simple Payments [Feature] SEO Tools Tools for improving a site's search engine optimization. [Feature] Stats Data Feature that enables users to track their site's traffic and gain insights on popular content. [Feature] VideoPress A feature to help you upload and insert videos on your site. [Package] Plans [Package] Stats Admin [Package] Status Plans [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Pri] Normal [Tests] Includes Tests [Type] Janitorial
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants