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

General: update requirements to match upcoming WP 6.0 release #24083

Merged
merged 16 commits into from
May 3, 2022

Conversation

jeherve
Copy link
Member

@jeherve jeherve commented Apr 26, 2022

Changes proposed in this Pull Request:

  • Update required WordPress version to WP 6.0 -1 (5.9)
  • Update tested up to version to WP 6.0

Jetpack product discussion

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

  • N/A

Testing instructions:

  • Is CI happy?
  • Are the numbers correct?

@jeherve jeherve added this to the jetpack/11.0 milestone Apr 26, 2022
@jeherve jeherve added General [Pri] Normal [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. [Type] Janitorial labels Apr 26, 2022
@jeherve jeherve self-assigned this Apr 26, 2022
@jeherve jeherve requested a review from kraftbj April 26, 2022 13:01
@matticbot
Copy link
Contributor

Caution: This PR has changes that must be merged to WordPress.com
Hello jeherve! These changes need to be synced to WordPress.com - If you 're an a11n, please commandeer and confirm D79510-code works as expected before merging this PR. Once this PR is merged, please commit the changes to WP.com. Thank you!
This revision will be updated with each commit to this PR

@jeherve jeherve mentioned this pull request Apr 26, 2022
6 tasks
@github-actions github-actions bot added [Plugin] Backup A plugin that allows users to save every change and get back online quickly with one-click restores. [Plugin] Boost A feature to speed up the site and improve performance. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. [Plugin] Social Issues about the Jetpack Social plugin [Plugin] Starter Plugin [Plugin] VaultPress [Tools] Development CLI The tools/cli to assist during JP development. Actions GitHub actions used to automate some of the work around releases and repository management labels Apr 26, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Apr 26, 2022

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 you’ve done so, switch to the "[Status] Needs Review" label; someone from Jetpack Crew will then review this PR and merge it to be included in the next Jetpack release.


Jetpack plugin:

  • Next scheduled release: June 7, 2022.
  • Scheduled code freeze: May 31, 2022.

Backup plugin:

  • Next scheduled release: June 7, 2022.
  • Scheduled code freeze: May 30, 2022.

Vaultpress plugin:

  • Next scheduled release: June 7, 2022.
  • Scheduled code freeze: May 30, 2022.

Boost plugin:

  • Next scheduled release: June 7, 2022.
  • Scheduled code freeze: May 30, 2022.

Search plugin:

  • Next scheduled release: May 30, 2022.
  • Scheduled code freeze: May 23, 2022.

Social plugin:

  • Next scheduled release: June 7, 2022.
  • Scheduled code freeze: May 30, 2022.

Starter Plugin plugin:

  • Next scheduled release: June 7, 2022.
  • Scheduled code freeze: May 30, 2022.

Protect plugin:

  • Next scheduled release: June 7, 2022.
  • Scheduled code freeze: May 30, 2022.

@jeherve jeherve added [Status] In Progress and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Apr 26, 2022
@kraftbj
Copy link
Contributor

kraftbj commented May 3, 2022

I'll work on landing 24224 right now so we can have this ready to merge at the same time as the #23908 to avoid folks having to bump their PRs too many times.

kraftbj
kraftbj previously approved these changes May 3, 2022
@kraftbj kraftbj merged commit 4d0acf4 into master May 3, 2022
@kraftbj kraftbj deleted the update/wp-compat-60 branch May 3, 2022 15:59
@github-actions
Copy link
Contributor

github-actions bot commented May 3, 2022

Great news! One last step: head over to your WordPress.com diff, D79510-code, and deploy it.
Once you've done so, come back to this PR and add a comment with your changeset ID.

Thank you!

matticbot pushed a commit to Automattic/vaultpress that referenced this pull request May 3, 2022
* General: update requirements to match upcoming WP 6.0 release

See #24082

* Update minimum version required in Jetpack

* WordPress' git repos now use trunk instead of master

See https://make.wordpress.org/core/2021/11/10/default-git-branch-for-wordpress-wordpress-develop/

That means our master tests have not really been running on the latest dev version of WordPress since last november. :|

* Update array of valid WP branches

* Update menu order id rounding

See https://core.trac.wordpress.org/ticket/40927

* Set up custom stats key values in tests depending on WP version

See https://core.trac.wordpress.org/ticket/40927

* Do not run failing tests on WordPress.com for now

See Automattic/jetpack#24083 (comment)

* Update to use ID instead of id

Co-authored-by: Brandon Kraft <[email protected]>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/2264920263
matticbot pushed a commit to Automattic/jetpack-sync that referenced this pull request May 3, 2022
* General: update requirements to match upcoming WP 6.0 release

See #24082

* Update minimum version required in Jetpack

* WordPress' git repos now use trunk instead of master

See https://make.wordpress.org/core/2021/11/10/default-git-branch-for-wordpress-wordpress-develop/

That means our master tests have not really been running on the latest dev version of WordPress since last november. :|

* Update array of valid WP branches

* Update menu order id rounding

See https://core.trac.wordpress.org/ticket/40927

* Set up custom stats key values in tests depending on WP version

See https://core.trac.wordpress.org/ticket/40927

* Do not run failing tests on WordPress.com for now

See Automattic/jetpack#24083 (comment)

* Update to use ID instead of id

Co-authored-by: Brandon Kraft <[email protected]>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/2264920263
matticbot pushed a commit to Automattic/jetpack-starter-plugin that referenced this pull request May 3, 2022
* General: update requirements to match upcoming WP 6.0 release

See #24082

* Update minimum version required in Jetpack

* WordPress' git repos now use trunk instead of master

See https://make.wordpress.org/core/2021/11/10/default-git-branch-for-wordpress-wordpress-develop/

That means our master tests have not really been running on the latest dev version of WordPress since last november. :|

* Update array of valid WP branches

* Update menu order id rounding

See https://core.trac.wordpress.org/ticket/40927

* Set up custom stats key values in tests depending on WP version

See https://core.trac.wordpress.org/ticket/40927

* Do not run failing tests on WordPress.com for now

See Automattic/jetpack#24083 (comment)

* Update to use ID instead of id

Co-authored-by: Brandon Kraft <[email protected]>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/2264920263
matticbot pushed a commit to Automattic/jetpack-boost-production that referenced this pull request May 3, 2022
* General: update requirements to match upcoming WP 6.0 release

See #24082

* Update minimum version required in Jetpack

* WordPress' git repos now use trunk instead of master

See https://make.wordpress.org/core/2021/11/10/default-git-branch-for-wordpress-wordpress-develop/

That means our master tests have not really been running on the latest dev version of WordPress since last november. :|

* Update array of valid WP branches

* Update menu order id rounding

See https://core.trac.wordpress.org/ticket/40927

* Set up custom stats key values in tests depending on WP version

See https://core.trac.wordpress.org/ticket/40927

* Do not run failing tests on WordPress.com for now

See Automattic/jetpack#24083 (comment)

* Update to use ID instead of id

Co-authored-by: Brandon Kraft <[email protected]>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/2264920263
matticbot pushed a commit to Automattic/jetpack-search-plugin that referenced this pull request May 3, 2022
* General: update requirements to match upcoming WP 6.0 release

See #24082

* Update minimum version required in Jetpack

* WordPress' git repos now use trunk instead of master

See https://make.wordpress.org/core/2021/11/10/default-git-branch-for-wordpress-wordpress-develop/

That means our master tests have not really been running on the latest dev version of WordPress since last november. :|

* Update array of valid WP branches

* Update menu order id rounding

See https://core.trac.wordpress.org/ticket/40927

* Set up custom stats key values in tests depending on WP version

See https://core.trac.wordpress.org/ticket/40927

* Do not run failing tests on WordPress.com for now

See Automattic/jetpack#24083 (comment)

* Update to use ID instead of id

Co-authored-by: Brandon Kraft <[email protected]>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/2264920263
matticbot pushed a commit to Automattic/jetpack-backup-plugin that referenced this pull request May 3, 2022
* General: update requirements to match upcoming WP 6.0 release

See #24082

* Update minimum version required in Jetpack

* WordPress' git repos now use trunk instead of master

See https://make.wordpress.org/core/2021/11/10/default-git-branch-for-wordpress-wordpress-develop/

That means our master tests have not really been running on the latest dev version of WordPress since last november. :|

* Update array of valid WP branches

* Update menu order id rounding

See https://core.trac.wordpress.org/ticket/40927

* Set up custom stats key values in tests depending on WP version

See https://core.trac.wordpress.org/ticket/40927

* Do not run failing tests on WordPress.com for now

See Automattic/jetpack#24083 (comment)

* Update to use ID instead of id

Co-authored-by: Brandon Kraft <[email protected]>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/2264920263
matticbot pushed a commit to Automattic/jetpack-production that referenced this pull request May 3, 2022
* General: update requirements to match upcoming WP 6.0 release

See #24082

* Update minimum version required in Jetpack

* WordPress' git repos now use trunk instead of master

See https://make.wordpress.org/core/2021/11/10/default-git-branch-for-wordpress-wordpress-develop/

That means our master tests have not really been running on the latest dev version of WordPress since last november. :|

* Update array of valid WP branches

* Update menu order id rounding

See https://core.trac.wordpress.org/ticket/40927

* Set up custom stats key values in tests depending on WP version

See https://core.trac.wordpress.org/ticket/40927

* Do not run failing tests on WordPress.com for now

See Automattic/jetpack#24083 (comment)

* Update to use ID instead of id

Co-authored-by: Brandon Kraft <[email protected]>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/2264920263
@jeherve
Copy link
Member Author

jeherve commented May 3, 2022

r244861-wpcom

@kraftbj
Copy link
Contributor

kraftbj commented May 7, 2022

Noting the id to ID changes made in this PR are no longer necessary; however, I think we should leave it.

Perk is older versions of Jetpack won't face any oddities due to the original issue. https://core.trac.wordpress.org/changeset/53362

jeherve added a commit that referenced this pull request May 19, 2022
…release (#24083)

* General: update requirements to match upcoming WP 6.0 release

See #24082

* Update minimum version required in Jetpack

* WordPress' git repos now use trunk instead of master

See https://make.wordpress.org/core/2021/11/10/default-git-branch-for-wordpress-wordpress-develop/

That means our master tests have not really been running on the latest dev version of WordPress since last november. :|

* Update array of valid WP branches

* Update menu order id rounding

See https://core.trac.wordpress.org/ticket/40927

* Set up custom stats key values in tests depending on WP version

See https://core.trac.wordpress.org/ticket/40927

* Do not run failing tests on WordPress.com for now

See #24083 (comment)

* Update to use ID instead of id

Co-authored-by: Brandon Kraft <[email protected]>
@jeherve
Copy link
Member Author

jeherve commented May 19, 2022

Cherry-picked to jetpack/branch-10.9 in a0b9931

@jeherve
Copy link
Member Author

jeherve commented May 19, 2022

Packages were updated in the release branch in d800479

anomiex added a commit that referenced this pull request Jun 9, 2022
When WordPress core renamed their main branch from "master" to "trunk",
first we didn't notice for several months. Then when we changed things
over in #24083, we overlooked changing the Jetpack test-running script
that was only running the multisite tests against WP "master" to run
against "trunk" instead.
anomiex added a commit that referenced this pull request Jun 10, 2022
When WordPress core renamed their main branch from "master" to "trunk",
first we didn't notice for several months. Then when we changed things
over in #24083, we overlooked changing the Jetpack test-running script
that was only running the multisite tests against WP "master" to run
against "trunk" instead.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Actions GitHub actions used to automate some of the work around releases and repository management [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations General [Package] Sync [Plugin] Backup A plugin that allows users to save every change and get back online quickly with one-click restores. [Plugin] Boost A feature to speed up the site and improve performance. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. [Plugin] Social Issues about the Jetpack Social plugin [Plugin] Starter Plugin [Plugin] VaultPress [Pri] Normal [Tools] Development CLI The tools/cli to assist during JP development. Touches WP.com Files [Type] Janitorial Unit Tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants