Skip to content

Commit 46e7fc9

Browse files
authored
MCLOUD-6910: MC-37292: Make 'quality-patches' a hard dependency for ece-tools and soft dependency for magento-cloud-patches (magento#780)
1 parent fb778a9 commit 46e7fc9

File tree

3 files changed

+7
-0
lines changed

3 files changed

+7
-0
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
composer config --unset repositories.repo.magento.com
2424
composer remove --no-update magento/magento-cloud-components
2525
composer remove --no-update magento/magento-cloud-docker
26+
composer remove --no-update magento/quality-patches
2627
composer remove --no-update magento/magento-cloud-patches
2728
- name: Composer Update
2829
run: composer update

.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ jobs:
4343
- php: '7.4'
4444
env: TEST_SUITE=functional-ee
4545

46+
before_install:
47+
# https://github.com/kylekatarnls/update-helper/issues/9
48+
- if [ -n "${COMPOSER_VERSION}" ]; then travis_retry composer self-update ${COMPOSER_VERSION}; fi;
49+
50+
4651
install:
4752
- composer config http-basic.repo.magento.com ${REPO_USERNAME_CE} ${REPO_PASSWORD_CE}
4853
- composer config github-oauth.github.com ${GITHUB_TOKEN}

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"magento/magento-cloud-components": "^1.0.6",
2525
"magento/magento-cloud-docker": "^1.0.0",
2626
"magento/magento-cloud-patches": "^1.0.6",
27+
"magento/quality-patches": "^1.0.3",
2728
"monolog/monolog": "^1.16",
2829
"nesbot/carbon": "^1.0||^2.0",
2930
"psr/container": "^1.0",

0 commit comments

Comments
 (0)