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

Style engine: wrap array_merge in conditionals to prevent unnecessary merging #66661

Merged
merged 1 commit into from
Nov 1, 2024

Conversation

ramonjd
Copy link
Member

@ramonjd ramonjd commented Nov 1, 2024

Backport changes from Core patch: WordPress/wordpress-develop#7670

Wrap array_merge in a conditional to prevent unnecessary firing.

Props to @mukeshpanchal27

Testing

CI tests should pass

Wrap array_merge in a conditional to prevent unnecessary firing.
@ramonjd ramonjd added [Type] Performance Related to performance efforts Backport from WordPress Core Pull request that needs to be backported to a Gutenberg release from WordPress Core [Package] Style Engine /packages/style-engine labels Nov 1, 2024
@ramonjd ramonjd self-assigned this Nov 1, 2024
Copy link

github-actions bot commented Nov 1, 2024

Warning: Type of PR label mismatch

To merge this PR, it requires exactly 1 label indicating the type of PR. Other labels are optional and not being checked here.

  • Type-related labels to choose from: [Type] Automated Testing, [Type] Breaking Change, [Type] Bug, [Type] Build Tooling, [Type] Code Quality, [Type] Copy, [Type] Developer Documentation, [Type] Enhancement, [Type] Experimental, [Type] Feature, [Type] New API, [Type] Task, [Type] Technical Prototype, [Type] Performance, [Type] Project Management, [Type] Regression, [Type] Security, [Type] WP Core Ticket, Backport from WordPress Core, Gutenberg Plugin.
  • Labels found: [Type] Performance, Backport from WordPress Core, [Package] Style Engine.

Read more about Type labels in Gutenberg. Don't worry if you don't have the required permissions to add labels; the PR reviewer should be able to help with the task.

Copy link

github-actions bot commented Nov 1, 2024

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: ramonjd <[email protected]>
Co-authored-by: aaronrobertshaw <[email protected]>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

Copy link

github-actions bot commented Nov 1, 2024

Flaky tests detected in 3d3a554.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/11624372578
📝 Reported issues:

Copy link
Contributor

@aaronrobertshaw aaronrobertshaw left a comment

Choose a reason for hiding this comment

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

LGTM 🚀

✅ Code changes match core PR
✅ Tests pass locally
✅ Smoke tested style engine manually and didn't spot any issues

@ramonjd
Copy link
Member Author

ramonjd commented Nov 1, 2024

Thanks for the thorough testing!

@ramonjd ramonjd merged commit 160a45a into trunk Nov 1, 2024
72 of 76 checks passed
@ramonjd ramonjd deleted the update/style-engine-wrap-array_merge branch November 1, 2024 05:49
@github-actions github-actions bot added this to the Gutenberg 19.7 milestone Nov 1, 2024
karthick-murugan pushed a commit to karthick-murugan/gutenberg that referenced this pull request Nov 13, 2024
… merging (WordPress#66661)

Wrap array_merge in a conditional to prevent unnecessary firing.

Co-authored-by: ramonjd <[email protected]>
Co-authored-by: aaronrobertshaw <[email protected]>
@joemcgill
Copy link
Member

Applied to core in https://core.trac.wordpress.org/changeset/59442

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport from WordPress Core Pull request that needs to be backported to a Gutenberg release from WordPress Core [Package] Style Engine /packages/style-engine
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants