Skip to content

Commit

Permalink
DEV-1819: Introduce composer 2 compatibility. (#27)
Browse files Browse the repository at this point in the history
  • Loading branch information
mostepaniukvm authored Dec 23, 2020
1 parent 353f955 commit 9915a1f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ install:
export GIT_BRANCH=$GIT_BRANCH
export GIT_COMMIT=$(git rev-parse HEAD)
./scripts/util/replace-vars.sh < tests/drupal-project/package.envsubst.json > tests/drupal-project/package.json
composer create-project drunomics/drupal-project:"dev-$GIT_BRANCH#$GIT_COMMIT" --repository=tests/drupal-project/package.json project
git fetch origin $GIT_BRANCH:$GIT_BRANCH
composer create-project drunomics/drupal-project:"dev-$GIT_BRANCH#$GIT_COMMIT" --no-install --repository=tests/drupal-project/package.json project
cd project && composer install && cd ../
script:
- cd project && vendor/bin/phapp setup localdev
Expand Down
11 changes: 5 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"require": {
"cweagans/composer-patches": "^1.6",
"cweagans/composer-patches": "^1.7",
"drunomics/dsk-config-split": "^1.0",
"drunomics/multisite-request-matcher": "^1.7",
"drunomics/phapp_env_mode": "^1.1",
Expand All @@ -19,13 +19,12 @@
"drupal/core-recommended": "^9",
"drupal/services_env_parameter": "^1.2",
"drush/drush": "^10",
"oomphinc/composer-installers-extender": "^1.1",
"symfony/dotenv": "^3.4",
"zaporylie/composer-drupal-optimizations": "^1.1"
"oomphinc/composer-installers-extender": "^2.0",
"symfony/dotenv": "^3.4"
},
"require-dev": {
"behat/mink-goutte-driver": "^1.2",
"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"devinci/devinci-behat-extension": "^0.1",
"dmore/behat-chrome-extension": "^1.2",
"drunomics/behat-drupal-utils": "^2.1",
Expand Down Expand Up @@ -101,7 +100,7 @@
"web-root": "web/"
}
},
"installer-types": ["library", "npm-asset", "bower-asset"],
"installer-types": ["npm-asset", "bower-asset"],
"installer-paths": {
"drush/Commands/contrib/{$name}": ["type:drupal-drush"],
"web/core": ["type:drupal-core"],
Expand Down

0 comments on commit 9915a1f

Please sign in to comment.