Skip to content

MAGECLOUD-4458: De-compose All Patches from ECE-Tools #630

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 18 commits into from
Oct 30, 2019
Merged

MAGECLOUD-4458: De-compose All Patches from ECE-Tools #630

merged 18 commits into from
Oct 30, 2019

Conversation

shiftedreality
Copy link
Member

@shiftedreality shiftedreality commented Oct 22, 2019 •
edited
Loading

Description

Fixed Issues (if relevant)

  1. https://magento2.atlassian.net/browse/MAGECLOUD-4458

Manual testing scenarios

  1. Edit composer.json:
    "repositories": {
        "repo": {
            "type": "composer",
            "url": "https://repo.magento.com"
        },
        "ece-tools": {
            "type": "vcs",
            "url": "git@github.com:magento/ece-tools.git"
        },
        "mcp": {
            "type": "vcs",
            "url": "git@github.com:magento/magento-cloud-patches.git"
        }
    },
    "require": {
        "magento/magento-cloud-metapackage": ">=2.3.0 <2.3.1",
        "magento/ece-tools": "dev-MAGECLOUD-4458 as 2002.0.99",
        "magento/magento-cloud-patches": "1.0.x-dev as 1.0.0"
    },
  1. Perform acceptance tests

Related Pull Requests

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)

@shiftedreality shiftedreality mentioned this pull request Oct 22, 2019
Merged
NadiyaS
NadiyaS reviewed Oct 22, 2019
View reviewed changes
composer.json Outdated
"twig/twig": "^1.0||^2.0",
"magento/magento-cloud-components": "^1.0.1"
"magento/magento-cloud-components": "^1.0.1",
"magento/magento-cloud-patches": "^1.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

why for cloud-components we allow minor releases and for patches only patch releases?
I am not against this, I just want to know the reason of this decision.

Copy link
Member Author

Choose a reason for hiding this comment

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

This is the same as ^1.0.0, so until 1.0.1 is released it does not make sense to add patch constraint part

Copy link
Member Author

Choose a reason for hiding this comment

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

https://semver.mwl.be/#!?package=madewithlove%2Felasticsearcher&version=%5E0.5&minimum-stability=stable vs https://semver.mwl.be/#!?package=madewithlove%2Felasticsearcher&version=%5E0.5.0&minimum-stability=stable

Copy link
Contributor

@NadiyaS NadiyaS Oct 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

I mixed up with ^0.1 which is equal to >=0.1.0 <0.2.0

Copy link
Contributor

@NadiyaS NadiyaS Oct 22, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Btw, I did not get what you wanted to show with those links. They do not show the real rule from this constraint

Copy link
Member Author

Choose a reason for hiding this comment

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

I just showed there is no difference betweeen ^1.0 and ^1.0.0 at this point

NadiyaS
NadiyaS previously approved these changes Oct 23, 2019
View reviewed changes
@mveeramneni mveeramneni added Progress: testing in progress PR/issue status and removed Progress: review PR/Issue status labels Oct 23, 2019
@mveeramneni mveeramneni self-assigned this Oct 23, 2019
@mveeramneni mveeramneni added Progress: review PR/Issue status and removed Progress: testing in progress PR/issue status labels Oct 23, 2019
@mveeramneni mveeramneni removed their assignment Oct 23, 2019
@shiftedreality shiftedreality added the Progress: on hold PR/issue status label Oct 23, 2019
@andriyShevtsov
Copy link
Contributor

As far as related PR was merged magento/magento-cloud-patches#2 I believe we can remove on-hold label from this

@andriyShevtsov andriyShevtsov removed the Progress: on hold PR/issue status label Oct 29, 2019
oshmyheliuk
oshmyheliuk reviewed Oct 29, 2019
View reviewed changes
codeception.dist.yml Outdated
- /var/www/magento/var
- /var/www/magento/app/etc
printOutput: false
printOutput: true
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it a good idea to change this value? Logs in Travis can be very huge.

Copy link
Member Author

Choose a reason for hiding this comment

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

Forgotten debug stmt, removed

oshmyheliuk
oshmyheliuk reviewed Oct 29, 2019
View reviewed changes
src/Patch/Manager.php
$this->logger->notice('File static.php was not found.');

return;
$this->logger->notice('File static.php was not found');
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we should move this functionality from here, this is not related to patch applying.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll keep in this 2002.0 branch and refactor in PR to develop as it does not give any profit

Copy link
Contributor

Choose a reason for hiding this comment

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

ok, agree

@shiftedreality shiftedreality added Progress: testing in progress PR/issue status and removed Progress: review PR/Issue status labels Oct 29, 2019
@andriyShevtsov
Copy link
Contributor

QA approved
Tested in scope of:

@shiftedreality shiftedreality added Progress: accept PR/issue status and removed Progress: testing in progress PR/issue status labels Oct 30, 2019
@shiftedreality shiftedreality merged commit 2ee0104 into 2002.0 Oct 30, 2019
@ghost
Copy link

ghost commented Oct 30, 2019

Hi @shiftedreality, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

@shiftedreality shiftedreality deleted the MAGECLOUD-4458 branch October 30, 2019 14:30
@YPyltiai YPyltiai added the Release: 2002.0.22 ECE-Tools Release label Oct 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
2 more reviewers

@NadiyaS NadiyaS NadiyaS approved these changes

@oshmyheliuk oshmyheliuk oshmyheliuk approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Progress: accept PR/issue status Release: 2002.0.22 ECE-Tools Release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@shiftedreality @andriyShevtsov @NadiyaS @oshmyheliuk @YPyltiai @mveeramneni