Skip to content

Commit 2ee0104

Browse files
MAGECLOUD-4458: De-compose All Patches from ECE-Tools (#630)
1 parent 2ee08d1 commit 2ee0104

File tree

118 files changed

+223
-22637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+223
-22637
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,14 @@ install:
5353
- if [ $TRAVIS_SECURE_ENV_VARS != "true" ]; then composer remove magento/magento-cloud-components --no-update; fi;
5454
- if [ $TRAVIS_SECURE_ENV_VARS != "true" ]; then composer config --unset repositories.repo.magento.com; fi;
5555
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then composer config http-basic.repo.magento.com ${REPO_USERNAME} ${REPO_PASSWORD}; fi;
56+
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then composer config github-oauth.github.com ${GITHUB_TOKEN}; fi;
57+
- if [ -n "${MCP_VERSION}" ]; then composer config repositories.mcp git git@github.com:magento/magento-cloud-patches.git && composer require "magento/magento-cloud-patches:${MCP_VERSION}" --no-update; fi;
5658
- composer update -n --no-suggest
5759

5860
before_script:
5961
- echo "COMPOSER_MAGENTO_USERNAME=${REPO_USERNAME}" >> ./.docker/composer.env
6062
- echo "COMPOSER_MAGENTO_PASSWORD=${REPO_PASSWORD}" >> ./.docker/composer.env
63+
- echo "COMPOSER_GITHUB_TOKEN=${GITHUB_TOKEN}" >> ./.docker/composer.env
6164
- if [ $XDEBUG == "true" ]; then echo "PHP_ENABLE_XDEBUG=true" >> ./.docker/global.env; fi;
6265
- sudo /etc/init.d/mysql stop
6366
- ./tests/travis/prepare_functional_parallel.sh

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
"symfony/process": "~2.1||~4.1.0",
3030
"symfony/yaml": "^3.3||^4.0",
3131
"twig/twig": "^1.0||^2.0",
32-
"magento/magento-cloud-components": "^1.0.1"
32+
"magento/magento-cloud-components": "^1.0.1",
33+
"magento/magento-cloud-patches": "^1.0.0"
3334
},
3435
"require-dev": {
3536
"php-mock/php-mock-phpunit": "^2.0",

patches.json

Lines changed: 0 additions & 230 deletions
This file was deleted.

patches/MAGECLOUD-1567__fix_import_during_ece_tools_dump__2.2.2.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

patches/MAGECLOUD-1582__fix_session_manager_locking__2.1.10.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

patches/MAGECLOUD-1582__fix_session_manager_locking__2.2.0.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)