Skip to content

Commit

Permalink
MAGECLOUD-4458: De-compose All Patches from ECE-Tools (#630)
Browse files Browse the repository at this point in the history
  • Loading branch information
shiftedreality authored Oct 30, 2019
1 parent 2ee08d1 commit 2ee0104
Show file tree
Hide file tree
Showing 118 changed files with 223 additions and 22,637 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,14 @@ install:
- if [ $TRAVIS_SECURE_ENV_VARS != "true" ]; then composer remove magento/magento-cloud-components --no-update; fi;
- if [ $TRAVIS_SECURE_ENV_VARS != "true" ]; then composer config --unset repositories.repo.magento.com; fi;
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then composer config http-basic.repo.magento.com ${REPO_USERNAME} ${REPO_PASSWORD}; fi;
- if [ $TRAVIS_SECURE_ENV_VARS == "true" ]; then composer config github-oauth.github.com ${GITHUB_TOKEN}; fi;
- if [ -n "${MCP_VERSION}" ]; then composer config repositories.mcp git [email protected]:magento/magento-cloud-patches.git && composer require "magento/magento-cloud-patches:${MCP_VERSION}" --no-update; fi;
- composer update -n --no-suggest

before_script:
- echo "COMPOSER_MAGENTO_USERNAME=${REPO_USERNAME}" >> ./.docker/composer.env
- echo "COMPOSER_MAGENTO_PASSWORD=${REPO_PASSWORD}" >> ./.docker/composer.env
- echo "COMPOSER_GITHUB_TOKEN=${GITHUB_TOKEN}" >> ./.docker/composer.env
- if [ $XDEBUG == "true" ]; then echo "PHP_ENABLE_XDEBUG=true" >> ./.docker/global.env; fi;
- sudo /etc/init.d/mysql stop
- ./tests/travis/prepare_functional_parallel.sh
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"symfony/process": "~2.1||~4.1.0",
"symfony/yaml": "^3.3||^4.0",
"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.0"
},
"require-dev": {
"php-mock/php-mock-phpunit": "^2.0",
Expand Down
230 changes: 0 additions & 230 deletions patches.json

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions patches/MAGECLOUD-1582__fix_session_manager_locking__2.1.10.patch

This file was deleted.

24 changes: 0 additions & 24 deletions patches/MAGECLOUD-1582__fix_session_manager_locking__2.2.0.patch

This file was deleted.

Loading

0 comments on commit 2ee0104

Please sign in to comment.