Skip to content

Conversation

@billygilbert
Copy link

@billygilbert billygilbert commented Dec 18, 2019

Description

https://magento2.atlassian.net/browse/MAGECLOUD-4884

Manual testing scenarios

  1. Install 2.3.1 on cloud
  2. Confirm patch PB-319__fix_pagebuilder_module_2.3.1.patch is applied
  3. Install 2.3.2 on cloud
  4. Confirm patch PB-320__fix_pagebuilder_module__2.3.2.patch is applied
  5. Install 2.3.2-p1 on cloud
  6. Confirm patch PB-322__fix_pagebuilder_module__2.3.2-p1.patch is applied
  7. Install 2.3.2-p2 on cloud
  8. Confirm patch PB-322__fix_pagebuilder_module__2.3.2-p1.patch is applied
  9. Install 2.3.3 on cloud
  10. Confirm patch PB-323__fix_pagebuilder_module__2.3.3.patch is applied
  11. Confirm that the MDVA-22979 patches are never applied

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

@@ -0,0 +1,1358 @@
diff -Nuar a/vendor/magento/module-page-builder/Controller/Adminhtml/Stage/Preview.php b/vendor/magento/module-page-builder/Controller/Adminhtml/Stage/Preview.php
new file mode 100644
index 000000000..be64e560d
Copy link
Contributor

Choose a reason for hiding this comment

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

This is not critical but it would be nice to remove indexes from new patches, we did this in all patches.

oshmyheliuk
oshmyheliuk previously approved these changes Dec 18, 2019
@YPyltiai
Copy link

YPyltiai commented Jan 3, 2020

@billygilbert please fix conflict.

patches.json Outdated
"2.3.2": "MDVA-22979__fix_pagebuilder_module__2.3.2.patch"
"2.3.1": "PB-319__fix_pagebuilder_module__2.3.1.patch",
"2.3.2": "PB-320__fix_pagebuilder_module__2.3.2.patch",
">=2.3.2-p1 <=2.3.2-p2": "PB-322__fix_pagebuilder_module__2.3.2-p1.patch",
Copy link

@YPyltiai YPyltiai Jan 3, 2020

Choose a reason for hiding this comment

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

In other patches we were using <2.3.3 instead of <=2.3.2-p2. The reason is - if eventually it is re-packed for some reason, the patch needs to keep applying.

Copy link
Author

Choose a reason for hiding this comment

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

@YPyltiai resolved.

@YPyltiai YPyltiai requested a review from davemacaulay January 3, 2020 16:07
@YPyltiai
Copy link

YPyltiai commented Jan 3, 2020

@davemacaulay, please review

davemacaulay
davemacaulay previously approved these changes Jan 3, 2020
Copy link

@davemacaulay davemacaulay left a comment

Choose a reason for hiding this comment

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

Looks good!

oshmyheliuk
oshmyheliuk previously approved these changes Jan 6, 2020
shiftedreality
shiftedreality previously approved these changes Jan 6, 2020
@andriyShevtsov
Copy link
Collaborator

QA approved

@andriyShevtsov andriyShevtsov added Progress: approved PR/issue status and removed qa labels Jan 7, 2020
@shiftedreality shiftedreality merged commit 7eb8f4a into develop Jan 7, 2020
@shiftedreality shiftedreality deleted the MAGECLOUD-4884 branch January 7, 2020 19:03
mmansoor-magento pushed a commit that referenced this pull request Dec 10, 2020
andriyShevtsov pushed a commit that referenced this pull request Sep 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Progress: approved PR/issue status

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants