Skip to content

Commit

Permalink
MAGECLOUD-4567: De-compose All Patches from ECE-Tools (magento#639)
Browse files Browse the repository at this point in the history
  • Loading branch information
shiftedreality authored Nov 8, 2019
1 parent b1a882e commit 48e1cba
Show file tree
Hide file tree
Showing 133 changed files with 382 additions and 32,647 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
/sandbox
/docker-compose.yml
/auth.json
/codeception.yml
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,13 @@ install:
- composer config github-oauth.github.com ${GITHUB_TOKEN}
- if [ -n "${MCC_VERSION}" ]; then composer config repositories.mcc git [email protected]:magento/magento-cloud-components.git && composer require "magento/magento-cloud-components:${MCC_VERSION}" --no-update; fi;
- if [ -n "${MCD_VERSION}" ]; then composer config repositories.mcd git [email protected]:magento/magento-cloud-docker.git && composer require "magento/magento-cloud-docker:${MCD_VERSION}" --no-update; 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;

script:
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
"guzzlehttp/guzzle": "^6.2",
"illuminate/config": "^5.6",
"magento/magento-cloud-components": "^1.0.1",
"magento/magento-cloud-docker": "^1.0.0",
"magento/magento-cloud-patches": "^1.0.0",
"monolog/monolog": "^1.16",
"nesbot/carbon": "^2.25",
"psr/container": "^1.0",
Expand All @@ -32,9 +34,6 @@
"symfony/serializer": "^3.3",
"symfony/yaml": "^3.3||^4.0"
},
"suggest": {
"magento/magento-cloud-docker": "^1.0"
},
"require-dev": {
"codeception/codeception": "^2.5.3",
"consolidation/robo": "^1.2",
Expand Down
247 changes: 0 additions & 247 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 48e1cba

Please sign in to comment.