feat: add workflow that automatically pulls upstream #1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO! Sorry for spam, I couldn't help myself. |
|
Great job! 👍👍👍 |
mage-os-ci
pushed a commit
that referenced
this pull request
Nov 25, 2022
…ints magento/magento2#35535: Magento 2.4.4 Mini cart item images not showing
mage-os-ci
pushed a commit
that referenced
this pull request
Apr 19, 2023
…\Language\\AST\\FieldNode, GraphQL\\Language\\AST\\InlineFragmentNode given - Added Inline Fragment Fields
mage-os-ci
pushed a commit
that referenced
this pull request
Apr 19, 2023
…\Language\\AST\\FieldNode, GraphQL\\Language\\AST\\InlineFragmentNode given - Fixed Static Test
mage-os-ci
pushed a commit
that referenced
this pull request
Dec 5, 2023
…iven in magento/framework/Setup/Patch/PatchApplier
mage-os-ci
pushed a commit
that referenced
this pull request
Dec 5, 2023
…iven in magento/framework/Setup/Patch/PatchApplier
Vinai
pushed a commit
that referenced
this pull request
Jan 25, 2024
* Fix \Magento\Paypal\Model\Express\CheckoutTest - dbIsolation missing
* Fix tests Magento\CatalogImportExport\Model\Import\ProductTest\ProductStockTest::testProductStockStatusShouldBeUpdatedOnSchedule
Zend_Db_Exception: Table "catalog_category_product_index_store0_replica" does not exist
Partially reverting fix from Vinai:
`Create category-product index table for store 0 (#47)
This fixes a regression introduced by pull request
https://github.com/mage-os/mageos-magento2/pull/25`
* Fix failing tests with error `undefined key 'product_id`' from app/code/Magento/CatalogInventory/Model/StockManagement.php:110
Test: dev/tests/integration/testsuite/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/DownloadableTest.php
* Fix failed tests: \Magento\Wishlist\Controller\Index\AddTest
Failed due to visibility filter in whishlist collection. Products were not added to root category and not reindexed. So visibility filter ued to exclude them from wishlist items collection: app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php:390
* Decrease test-cases - use php 8.2 only for testing purposes
Include and use changed workflow to have more unitary tests executions
* Mark tests as incomplete as actual fix is in: mage-os/mageos-magento-zend-db#1
Error that was fixed:
Unable to revert fixture: Magento/Framework/Backup/_files/trigger.php
#0 /var/www/html/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php(42): Magento\Framework\Backup\DbTest->testBackupAndRollbackIncludesCustomTriggers()
...
* Fix integration tests error:
Magento\Framework\Image\Adapter\InterfaceTest::testRotate with data set #4 ('/var/www/html/dev/tests/integ...st.png', 45, array(157, 35), 'IMAGEMAGICK')
ImagickException: unrecognized color `srgb255,255,255' @ warning/color.c/GetColorCompliance/1064
* Fix integration tests error:
Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set #1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
ImagickException: unable to read font `' @ error/annotate.c/RenderFreetype/1636
* Fix integration tests error:
Magento\Dhl\Model\CarrierTest::testRequestToShip with data set #0 ('GB', 'EU', 'US')
Failed asserting that two DOM documents are equal.
- <SoftwareName>Magento</SoftwareName>
+ <SoftwareName>Mage-OS</SoftwareName>
* Fix integration tests error:
Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set #1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
PHPUnit\Framework\Exception: Deprecated: Implicit conversion from float 11.34375 to int loses precision in /var/www/html/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php:505.
* Fix integration tests error:
Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set #1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
PHPUnit\Framework\Exception: Deprecated: Implicit conversion from float 11.34375 to int loses precision in /var/www/html/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php:505.
* Fix integration tests error:
Magento\Framework\Image\Adapter\InterfaceTest::testRotate with data set #4 ('/var/www/html/dev/tests/integ...st.png', 45, array(157, 35), 'IMAGEMAGICK')
ImagickException: unrecognized color `srgb255,255,255' @ warning/color.c/GetColorCompliance/1064
* Revert "feat(catalog): faster category product count (#25)"
This reverts commit f01535b.
* Revert "Create category-product index table for store 0 (#47)"
This reverts commit 7be2613.
* Add optional param to run tests over specific directory only.
* Fix failed tests: \Magento\Version\Controller\Index\IndexTest
Update package name to mage-os
* Fix integration tests (most likely caused by incorrect merge conflict resolving):
error msg:
1) Magento\Catalog\Block\Adminhtml\Category\Checkboxes\TreeTest::testGetTreeJson
Error: Call to a member function getConnectionName() on null
/var/www/html/lib/internal/Magento/Framework/App/ResourceConnection.php:110
/var/www/html/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php:570
...
ref: https://github.com/vpodorozh/mageos-magento2/actions/runs/7472531139/job/20334972566#step:6:39
* Fix failed integration tests in \Magento\Customer
* Revert "Fix failed integration tests in \Magento\Customer"
* Update full-integration-tests.yaml
---------
Co-authored-by: Maksym Novik <[email protected]>
Co-authored-by: Maksym Novik <[email protected]>
Co-authored-by: Ihor Sviziev <[email protected]>
mage-os-ci
pushed a commit
that referenced
this pull request
Jul 5, 2024
mage-os-ci
pushed a commit
that referenced
this pull request
Oct 30, 2024
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description (*)
This pull request adds a workflow that automatically attempts to pull from upstream. It is done every morning at 10:10am. This gives the mirror sync some time to complete.
When the merge succeeds, we simply allow it to happen and push it to our repository.
When the merge fails, we create a
2.x-develop-upstreambranch. This branch is then used to create a (draft) Pull Request that can be manually handled by a human.As long as this
2.x-develop-upstreambranch exists (in other words: as long as there hasn't been a conflict resolution), we will not attempt an automatic merge again. This does mean that we need to ensure to also manually delete the upstream branch whenever we have solved the conflict. I intend to create a separate github action in a separate PR to handle this automatically.Finally, after the Pull Request has been created, we send a notification to the Mage-OS discord with a link to the PR and the output of the (failed) merge.
Please note that this workflow requires a secret called
DISCORD_WEBHOOK. It must be configured in the repository settings.If you have any comments or questions, I'm happy to hear them!