diff --git a/app/config/caches.sh b/app/config/caches.sh index e659d1ae..9a8e0d94 100644 --- a/app/config/caches.sh +++ b/app/config/caches.sh @@ -24,7 +24,6 @@ git_cache_setup "https://github.com/civicrm/civicrm-packages.git" "$C git_cache_setup "https://github.com/civicrm/civicrm-joomla.git" "$CACHE_DIR/civicrm/civicrm-joomla.git" git_cache_setup "https://github.com/civicrm/civicrm-wordpress.git" "$CACHE_DIR/civicrm/civicrm-wordpress.git" git_cache_setup "https://github.com/civicrm/civicrm-demo-wp.git" "$CACHE_DIR/civicrm/civicrm-demo-wp.git" -git_cache_setup "https://github.com/eileenmcnaughton/civicrm_developer.git" "$CACHE_DIR/eileenmcnaughton/civicrm_developer.git" git_cache_setup "https://github.com/civicrm/api4.git" "$CACHE_DIR/civicrm/api4.git" git_cache_setup "https://lab.civicrm.org/extensions/civirules.git" "$CACHE_DIR/civicrm/org.civicoop.civirules.git" diff --git a/app/config/drupal10-clean/download.sh b/app/config/drupal10-clean/download.sh index 7f1f55a9..75c336d0 100644 --- a/app/config/drupal10-clean/download.sh +++ b/app/config/drupal10-clean/download.sh @@ -13,7 +13,6 @@ composer create-project drupal/recommended-project:"$CMS_VERSION" "$WEB_ROOT" -- pushd "$WEB_ROOT" >> /dev/null composer_allow_common_plugins composer require drupal/userprotect - composer require drupal/devel composer require drush/drush ## Some D8 builds include a specific revision of phpunit, but Civi uses standalone phpunit (PHAR) if composer info | grep -q ^phpunit/phpunit\ ; then @@ -22,6 +21,6 @@ pushd "$WEB_ROOT" >> /dev/null composer remove phpunit/phpunit composer install --no-dev --no-interaction fi - drupal8_po_download "${CIVICRM_LOCALES:-de_DE}" "drupal-$( _drupalx_version x.y ).x" devel-5.1.x + drupal8_po_download "${CIVICRM_LOCALES:-de_DE}" "drupal-$( _drupalx_version x.y ).x" civicrm_download_composer_d8 popd >> /dev/null diff --git a/app/config/drupal10-empty/download.sh b/app/config/drupal10-empty/download.sh index 778fcfc6..5af5a197 100644 --- a/app/config/drupal10-empty/download.sh +++ b/app/config/drupal10-empty/download.sh @@ -12,7 +12,6 @@ composer create-project drupal/recommended-project:"$CMS_VERSION" "$WEB_ROOT" -- pushd "$WEB_ROOT" >> /dev/null composer_allow_common_plugins - composer require drupal/devel composer require drush/drush - drupal8_po_download "${CIVICRM_LOCALES:-de_DE}" "drupal-$( _drupalx_version x.y ).x" devel-5.1.x + drupal8_po_download "${CIVICRM_LOCALES:-de_DE}" "drupal-$( _drupalx_version x.y ).x" popd >> /dev/null