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

Changes from upstream Magento release 2.4.7-p4 #121

Merged
merged 5 commits into from
Feb 13, 2025

Conversation

rhoerr
Copy link
Contributor

@rhoerr rhoerr commented Feb 12, 2025

Description (*)

This PR pulls the changes from 2.4.7-p4 vs 2.4.7-p3 onto release/1.x. This brings it in line with 2.4.7-p4 for our next release.

I sourced the change list from https://github.com/magento/magento2/compare/2.4.7-p3..2.4.7-p4 with all composer.json changes removed, and merge conflicts resolved via PhpStorm.

@rhoerr rhoerr requested a review from a team as a code owner February 12, 2025 01:13
@rhoerr
Copy link
Contributor Author

rhoerr commented Feb 12, 2025

Note: I've run the full integration test suite at https://github.com/rhoerr/mageos-magento2/actions/runs/13289101304 .

  • A couple failures on the previous run were related to merge issues (duplicated XML lines), which I've fixed.
  • One failure is a test constructor issue for ProductMetadata. I'm not sure if that affects upstream too or is unique to us, either way it's not blocking.
  • Most failures are related to addresses returning two street lines always, which I think is a direct result of Solve bug #116 - Setting number of address line lower breaks checkout #117 .

IMO in both cases these issues should be fixed so the tests pass, but shouldn't block us pushing the 1.0.6 release.

@fballiano
Copy link
Contributor

@Vinai @sprankhub could you give this one a check?

@rhoerr
Copy link
Contributor Author

rhoerr commented Feb 12, 2025

Francis Gallagher reviewed on MageChat and says it looks good (nothing notably missed).

He suggested diffing commits/tags directly, which I did as well to confirm that.

magento2$ git diff 2.4.7-p3 2.4.7-p4 -- . > 2.4.7-p3-p4.diff
mageos$ git diff c0bbd6f08be3381f42c85f8f400db3f1ce1232db 483e0d7d759704dbaea5528c07d0d6f079c857e4 -- . > mageos-1.0.6.diff

I'm running another test suite at https://github.com/rhoerr/mageos-magento2/actions/runs/13296916454. Will give that 30 mins; assuming that looks good, I'll merge and then do a preview release.

@rhoerr rhoerr merged commit 3a3f6bf into mage-os:release/1.x Feb 13, 2025
7 checks passed
@rhoerr rhoerr deleted the update/magento-2.4.7-p4 branch February 13, 2025 00:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants