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

Fix .wp-env.json to WP 5.8.1 #36333

Merged
merged 7 commits into from
Nov 10, 2021
Merged

Fix .wp-env.json to WP 5.8.1 #36333

merged 7 commits into from
Nov 10, 2021

Conversation

noisysocks
Copy link
Member

@noisysocks noisysocks commented Nov 9, 2021

Try fixing .wp-env.json to the 5.8.1 branch as a temporary fix for Gutenberg CI. This should unblock Gutenberg developers while the plugin is made compatible with WordPress trunk.

Other changes include:

  • Skip the test_kses_doesnt_change_fixtures tests introduced in Tests: Run block fixtures through KSES. #35611. These tests depend on a change in WordPress 5.9 (https://core.trac.wordpress.org/ticket/54261), so in order to get the tests passing in 5.8.1, for the moment these tests are marked as skipped.
  • The test_merges_child_theme_json_into_parent_theme_json test for the theme resolver was pointing to the core WP_Theme_JSON_Resolver class instead of the Gutenberg one WP_Theme_JSON_Resolver_Gutenberg. This PR updates the test to use the latter so we're targeting the Gutenberg class.

@noisysocks noisysocks added [Type] Build Tooling Issues or PRs related to build tooling Gutenberg Plugin Issues or PRs related to Gutenberg Plugin management related efforts labels Nov 9, 2021
@andrewserong andrewserong changed the title Fix .wp-env.json to WP 5.8 Fix .wp-env.json to WP 5.8.1 Nov 9, 2021
@andrewserong
Copy link
Contributor

Since pinning to other commits didn't appear to work, I've tried pinning this to WordPress 5.8.1 and skipping the test introduced in #35611. This leaves one remaining failing test, WP_Theme_JSON_Resolver_Gutenberg_Test::test_merges_child_theme_json_into_parent_theme_json, which appears to have last been updated in #36223. I imagine that test is depending on something in core that isn't in 5.8.1? If anyone has any other ideas or would like to jump into this PR, feel free to!

noisysocks and others added 7 commits November 10, 2021 10:41
Copy link
Contributor

@andrewserong andrewserong left a comment

Choose a reason for hiding this comment

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

The e2es and performance tests are now passing, so just giving this the ✅. Do folks think this is okay to merge now?

Copy link
Contributor

@glendaviesnz glendaviesnz left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewserong andrewserong merged commit fdf7185 into trunk Nov 10, 2021
@andrewserong andrewserong deleted the try/fix-wp-env-to-5.8 branch November 10, 2021 02:20
@github-actions github-actions bot added this to the Gutenberg 12.0 milestone Nov 10, 2021
talldan added a commit that referenced this pull request Nov 10, 2021
@andrewserong andrewserong mentioned this pull request Nov 10, 2021
28 tasks
andrewserong added a commit that referenced this pull request Nov 10, 2021
* Fix .wp-env.json to WP 5.8

Try fixing .wp-env.json to the 5.8 branch as a temporary fix for Gutenberg CI. This should unblock Gutenberg developers while the plugin is made compatible with WordPress trunk.

* Pin to 5.8.1 to fix majority of unit test failures

* Pin to specific sha that fixed php unit tests

* Try a different sha

* Try pinning to 5.8.1 and skipping failing test that requires 5.9

* Fix linting issue

* Update merges child theme JSON test to use Gutenberg class instead of core WP_Theme_JSON_Resolver class

Co-authored-by: Glen Davies <[email protected]>
Co-authored-by: Andrew Serong <[email protected]>
@andrewserong
Copy link
Contributor

Cherry picked into the Gutenberg 11.9 release in: 00b7a54

Mamaduka pushed a commit that referenced this pull request Nov 10, 2021
* Revert "Fix .wp-env.json to WP 5.8.1 (#36333)"

This reverts commit fdf7185.

* Remove tests for menus endpoints, which now exist in WordPress core

* Fix image size test

* Change theme json test back to version in trunk

* Update menu rest endpoints to stable

* Fix media upload tests
noisysocks pushed a commit that referenced this pull request Nov 11, 2021
* Revert "Fix .wp-env.json to WP 5.8.1 (#36333)"

This reverts commit fdf7185.

* Remove tests for menus endpoints, which now exist in WordPress core

* Fix image size test

* Change theme json test back to version in trunk

* Update menu rest endpoints to stable

* Fix media upload tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Gutenberg Plugin Issues or PRs related to Gutenberg Plugin management related efforts [Type] Build Tooling Issues or PRs related to build tooling
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants