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

Sync packages for WP 6.1 Beta 2 #3342

Closed
wants to merge 1 commit into from
Closed

Conversation

ockham
Copy link
Contributor

@ockham ockham commented Sep 27, 2022

Includes the latest round of Gutenberg bugfix PRs that were approved for inclusion during yesterday’s triage session.

Needed for today's WP 6.1 Beta 2 release (scheduled in ~3 hours from now).

Trac ticket: https://core.trac.wordpress.org/ticket/56467


This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.

$color_block_styles['background'] = $preset_background_color ? $preset_background_color : $custom_background_color;

// Generate color styles and classes.
$styles = gutenberg_style_engine_get_styles( array( 'color' => $color_block_styles ), array( 'convert_vars_to_classnames' => true ) );
Copy link
Contributor

Choose a reason for hiding this comment

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

@ockham The prefix should be changed to wp_ instead of gutenberg_.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ugh, I missed that one. I'll fix it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sidenote, I don't quite understand how this ended up here. The relevant GB PR (WordPress/gutenberg#42029) was only merged after GB 14.1 was released, and we didn't cherry-pick it to the wp/6.1 branch. In fact, the relevant code is absent from that file in Gutenberg's wp/6.1 branch 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like the script picked up the wrong package version(s): For @wordpress/block-library, I see 7.15.0.

But the wp-6.1 tag points to 7.14.3.

I think we had a similar issue before with #3154, but I'm not 100% sure what @gziolo did to fix it...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think I forgot to specify the dist-tag. Note to future self:

npm run sync-gutenberg-packages -- --dist-tag=wp-6.1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

(Re-syncing now.)

Copy link
Contributor Author

@ockham ockham left a comment

Choose a reason for hiding this comment

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

Please hold off reviewing this -- it appears that the sync script picked up the wrong package versions.

@ockham
Copy link
Contributor Author

ockham commented Sep 27, 2022

I've reverted the original commit and run npm run sync-gutenberg-packages -- --dist-tag=wp-6.1 locally now. I've pushed the commits to this branch but don't see them yet here 😕

FWIW, GitHub Status is showing some issue with GH Actions (but no other GH components).

@ockham
Copy link
Contributor Author

ockham commented Sep 27, 2022

Closing. This PR has been flaky, and we've decided that we don't want to include WordPress/gutenberg#43862, so we'll need to revert that on GB's wp/6.1 branch and then re-publish npms.

@ockham ockham closed this Sep 27, 2022
@ockham
Copy link
Contributor Author

ockham commented Sep 27, 2022

New sync PR: #3345

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

2 participants