Skip to content

Commit

Permalink
MCLOUD-6910: MC-37292: Make 'quality-patches' a hard dependency for e…
Browse files Browse the repository at this point in the history
…ce-tools and soft dependency for magento-cloud-patches (#780)
  • Loading branch information
BaDos authored Sep 9, 2020
1 parent fb778a9 commit 46e7fc9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
composer config --unset repositories.repo.magento.com
composer remove --no-update magento/magento-cloud-components
composer remove --no-update magento/magento-cloud-docker
composer remove --no-update magento/quality-patches
composer remove --no-update magento/magento-cloud-patches
- name: Composer Update
run: composer update
Expand Down
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ jobs:
- php: '7.4'
env: TEST_SUITE=functional-ee

before_install:
# https://github.com/kylekatarnls/update-helper/issues/9
- if [ -n "${COMPOSER_VERSION}" ]; then travis_retry composer self-update ${COMPOSER_VERSION}; fi;


install:
- composer config http-basic.repo.magento.com ${REPO_USERNAME_CE} ${REPO_PASSWORD_CE}
- composer config github-oauth.github.com ${GITHUB_TOKEN}
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"magento/magento-cloud-components": "^1.0.6",
"magento/magento-cloud-docker": "^1.0.0",
"magento/magento-cloud-patches": "^1.0.6",
"magento/quality-patches": "^1.0.3",
"monolog/monolog": "^1.16",
"nesbot/carbon": "^1.0||^2.0",
"psr/container": "^1.0",
Expand Down

0 comments on commit 46e7fc9

Please sign in to comment.