diff --git a/.travis.yml b/.travis.yml index 087188361f..e4412e2ad4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/composer.json b/composer.json index 111921459d..b1aac7c4bc 100644 --- a/composer.json +++ b/composer.json @@ -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", @@ -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", @@ -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"],