Skip to content

Commit

Permalink
Merge pull request #793 from mlutfy/cleanupD7devel
Browse files Browse the repository at this point in the history
Remove devel and volunteer from D7 builds
  • Loading branch information
totten authored Jul 26, 2023
2 parents 779bfe5 + 7f99a7a commit 9637069
Show file tree
Hide file tree
Showing 28 changed files with 20 additions and 162 deletions.
2 changes: 0 additions & 2 deletions app/config/backdrop-demo/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ pushd "$WEB_ROOT/web/modules" >> /dev/null
git clone ${CACHE_DIR}/civicrm/civicrm-core.git -b "$CIVI_VERSION" civicrm
git clone ${CACHE_DIR}/civicrm/civicrm-backdrop.git -b "1.x-$CIVI_VERSION" civicrm/backdrop
git clone ${CACHE_DIR}/civicrm/civicrm-packages.git -b "$CIVI_VERSION" civicrm/packages
git clone "${CACHE_DIR}/civicrm/civivolunteer.git" -b "$VOL_VERSION" civicrm/tools/extensions/civivolunteer
git clone "${CACHE_DIR}/ginkgostreet/org.civicrm.angularprofiles.git" -b "$NG_PRFL_VERSION" civicrm/tools/extensions/org.civicrm.angularprofiles
git clone "${CACHE_DIR}/civicrm/org.civicoop.civirules.git" -b "$RULES_VERSION" civicrm/tools/extensions/org.civicoop.civirules
git clone "${CACHE_DIR}/TechToThePeople/civisualize.git" -b "master" civicrm/tools/extensions/civisualize
git clone "${CACHE_DIR}/civicrm/org.civicrm.module.cividiscount.git" -b "$DISC_VERSION" civicrm/tools/extensions/cividiscount
Expand Down
9 changes: 1 addition & 8 deletions app/config/caches.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,9 @@ 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://github.com/civicrm/civivolunteer.git" "$CACHE_DIR/civicrm/civivolunteer.git"
git_cache_setup "https://lab.civicrm.org/extensions/angularprofiles.git" "$CACHE_DIR/ginkgostreet/org.civicrm.angularprofiles.git"

git_cache_setup "https://lab.civicrm.org/extensions/civirules.git" "$CACHE_DIR/civicrm/org.civicoop.civirules.git"
git_cache_setup "https://github.com/TechToThePeople/civisualize.git" "$CACHE_DIR/TechToThePeople/civisualize.git"
git_cache_setup "https://lab.civicrm.org/extensions/civisualize.git" "$CACHE_DIR/TechToThePeople/civisualize.git"
git_cache_setup "https://lab.civicrm.org/extensions/cividiscount.git" "$CACHE_DIR/civicrm/org.civicrm.module.cividiscount.git"
git_cache_setup "https://github.com/civicrm/org.civicrm.contactlayout.git" "$CACHE_DIR/civicrm/org.civicrm.contactlayout.git"

## SVN data is stale (last updated Apr 2014). Use daily tarballs instead.
#svn_cache_setup "https://svn.civicrm.org/l10n/trunk" "$CACHE_DIR/civicrm/l10n-trunk.svn"
14 changes: 0 additions & 14 deletions app/config/civihr/drush.make.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,6 @@ projects[views][patch][] = "https://www.drupal.org/files/issues/views-exposed_fo
projects[userprotect][subdir] = contrib
projects[userprotect][version] = "1.1"

; ****************************************
; Developer modules
; ****************************************

projects[devel][subdir] = contrib
projects[devel][version] = 1.5

libraries[civicrmdeveloper][destination] = modules
libraries[civicrmdeveloper][directory_name] = contrib/civicrm_developer
libraries[civicrmdeveloper][download][type] = git
libraries[civicrmdeveloper][download][url] = %%CACHE_DIR%%/eileenmcnaughton/civicrm_developer.git
libraries[civicrmdeveloper][download][branch] = master
libraries[civicrmdeveloper][overwrite] = TRUE

; ****************************************
; Compucorp contrib modules
; ****************************************
Expand Down
2 changes: 1 addition & 1 deletion app/config/d8leg-clean/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ composer create-project drupal/legacy-project:"$CMS_VERSION" "$WEB_ROOT/web" --n

pushd "$WEB_ROOT/web" >> /dev/null
composer_allow_common_plugins
composer require drupal/{devel,libraries,userprotect}
composer require drupal/{libraries,userprotect}
civicrm_download_composer_d8
popd >> /dev/null
2 changes: 1 addition & 1 deletion app/config/d8prj-clean/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ composer create-project drupal-composer/drupal-project:"$CMS_VERSION" "$WEB_ROOT

pushd "$WEB_ROOT" >> /dev/null
composer_allow_common_plugins
composer require drupal/{devel,libraries,userprotect}
composer require drupal/{libraries,userprotect}
civicrm_download_composer_d8
popd >> /dev/null
2 changes: 1 addition & 1 deletion app/config/d8prj-empty/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
composer create-project drupal-composer/drupal-project:"$CMS_VERSION" "$WEB_ROOT" --no-interaction

pushd "$WEB_ROOT" >> /dev/null
composer require drupal/{devel,libraries}
composer require drupal/libraries
popd >> /dev/null
2 changes: 1 addition & 1 deletion app/config/d8prj-re/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
composer create-project drupal-composer/drupal-project:"$CMS_VERSION" "$WEB_ROOT" --no-interaction

pushd "$WEB_ROOT" >> /dev/null
composer require drupal/{devel,libraries}
composer require drupal/libraries

## NOTE: No support for CIVI_VERSION
## NOTE: pear/log has a silly requirement for exactly 1.0.0
Expand Down
2 changes: 1 addition & 1 deletion app/config/d8rec-clean/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
composer create-project drupal/recommended-project:"$CMS_VERSION" "$WEB_ROOT" --no-interaction

pushd "$WEB_ROOT" >> /dev/null
composer require drupal/{devel,libraries,userprotect}
composer require drupal/{libraries,userprotect}
civicrm_download_composer_d8
popd >> /dev/null
10 changes: 0 additions & 10 deletions app/config/drupal-case/drush.make.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,6 @@ projects[userprotect][version] = "1.0"
; Developer modules
; ****************************************

projects[devel][subdir] = contrib
projects[devel][version] = 1.3

libraries[civicrmdeveloper][destination] = modules
libraries[civicrmdeveloper][directory_name] = contrib/civicrm_developer
libraries[civicrmdeveloper][download][type] = git
libraries[civicrmdeveloper][download][url] = %%CACHE_DIR%%/eileenmcnaughton/civicrm_developer.git
libraries[civicrmdeveloper][download][branch] = master
libraries[civicrmdeveloper][overwrite] = TRUE

libraries[shoreditch][destination] = modules
libraries[shoreditch][directory_name] = civicrm/ext/shoreditch
libraries[shoreditch][download][type] = git
Expand Down
5 changes: 2 additions & 3 deletions app/config/drupal-clean/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@
drupal_download

pushd "$WEB_ROOT/web"
drush dl -y libraries-1.0 views-3.7 devel-1.x
drupal7_po_download "${CIVICRM_LOCALES:-de_DE}" drupal-7.x views-7.x-3.x devel-7.x-1.x
drush dl -y libraries-1.0 views-3.7
drupal7_po_download "${CIVICRM_LOCALES:-de_DE}" drupal-7.x views-7.x-3.x

pushd sites/all/modules
git clone "${CACHE_DIR}/civicrm/civicrm-core.git" -b "$CIVI_VERSION" civicrm
git clone "${CACHE_DIR}/civicrm/civicrm-drupal.git" -b "7.x-$CIVI_VERSION" civicrm/drupal
git clone "${CACHE_DIR}/civicrm/civicrm-packages.git" -b "$CIVI_VERSION" civicrm/packages
git clone "${CACHE_DIR}/eileenmcnaughton/civicrm_developer.git" -b master civicrm_developer
api4_download_conditional civicrm civicrm/ext/api4

extract-url --cache-ttl 172800 civicrm=http://download.civicrm.org/civicrm-l10n-core/archives/civicrm-l10n-daily.tar.gz
Expand Down
14 changes: 0 additions & 14 deletions app/config/drupal-clean42/drush.make.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,3 @@ projects[libraries][version] = 1.0

projects[views][subdir] = contrib
projects[views][version] = 3.7

; ****************************************
; Developer modules
; ****************************************

projects[devel][subdir] = contrib
projects[devel][version] = 1.3

libraries[civicrmdeveloper][destination] = modules
libraries[civicrmdeveloper][directory_name] = contrib/civicrm_developer
libraries[civicrmdeveloper][download][type] = git
libraries[civicrmdeveloper][download][url] = %%CACHE_DIR%%/eileenmcnaughton/civicrm_developer.git
libraries[civicrmdeveloper][download][branch] = master
libraries[civicrmdeveloper][overwrite] = TRUE
7 changes: 2 additions & 5 deletions app/config/drupal-demo/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,14 @@
drupal_download

pushd "$WEB_ROOT/web"
drush8 dl -y libraries-1 redirect-1 webform-4 options_element-1 webform_civicrm-4 views-3 login_destination-1 userprotect-1 devel-1 civicrm_error-2.x-dev
drupal7_po_download "${CIVICRM_LOCALES:-de_DE}" drupal-7.x webform-7.x-4.x webform_civicrm-7.x-4.x views-7.x-3.x login_destination-7.x-1.x userprotect-7.x-1.x devel-7.x-1.x
drush8 dl -y libraries-1 redirect-1 webform-4 options_element-1 webform_civicrm-4 views-3 login_destination-1 userprotect-1
drupal7_po_download "${CIVICRM_LOCALES:-de_DE}" drupal-7.x webform-7.x-4.x webform_civicrm-7.x-4.x views-7.x-3.x login_destination-7.x-1.x userprotect-7.x-1.x

pushd sites/all/modules
git clone "${CACHE_DIR}/civicrm/civicrm-core.git" -b "$CIVI_VERSION" civicrm
git clone "${CACHE_DIR}/civicrm/civicrm-drupal.git" -b "7.x-$CIVI_VERSION" civicrm/drupal
git clone "${CACHE_DIR}/civicrm/civicrm-packages.git" -b "$CIVI_VERSION" civicrm/packages
api4_download_conditional civicrm civicrm/ext/api4
git clone "${CACHE_DIR}/eileenmcnaughton/civicrm_developer.git" -b master civicrm_developer
git clone "${CACHE_DIR}/civicrm/civivolunteer.git" -b "$VOL_VERSION" civicrm/tools/extensions/civivolunteer
git clone "${CACHE_DIR}/ginkgostreet/org.civicrm.angularprofiles.git" -b "$NG_PRFL_VERSION" civicrm/tools/extensions/org.civicrm.angularprofiles
git clone "${CACHE_DIR}/civicrm/org.civicoop.civirules.git" -b "$RULES_VERSION" civicrm/tools/extensions/org.civicoop.civirules
git clone "${CACHE_DIR}/TechToThePeople/civisualize.git" -b "master" civicrm/tools/extensions/civisualize
git clone "${CACHE_DIR}/civicrm/org.civicrm.module.cividiscount.git" -b "$DISC_VERSION" civicrm/tools/extensions/cividiscount
Expand Down
22 changes: 0 additions & 22 deletions app/config/drupal-demo/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -135,28 +135,6 @@ EOPERM
EOPERM
## Note: If you enable CiviGrant, the grant 'access CiviGrant', 'edit grants', 'delete in CiviGrant'

## Setup demo extensions
cv en --ignore-missing $CIVI_DEMO_EXTS
if [[ "$CIVI_DEMO_EXTS" =~ volunteer ]]; then
drush scr "$PRJDIR/src/drush/perm.php" <<EOPERM
role 'anonymous user'
role 'authenticated user'
role 'civicrm_webtest_user'
add 'register to volunteer'
EOPERM
drush scr "$PRJDIR/src/drush/perm.php" <<EOPERM
role 'civicrm_webtest_user'
add 'create volunteer projects'
add 'edit own volunteer projects'
add 'edit all volunteer projects'
add 'log own hours'
add 'edit volunteer project relationships'
add 'edit volunteer registration profiles'
add 'delete own volunteer projects'
add 'delete all volunteer projects'
EOPERM
fi

## Demo sites always disable email and often disable cron
drush cvapi StatusPreference.create ignore_severity=critical name=checkOutboundMail
drush cvapi StatusPreference.create ignore_severity=critical name=checkLastCron
Expand Down
4 changes: 2 additions & 2 deletions app/config/drupal-empty/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
drupal_download

pushd "$WEB_ROOT/web"
drush dl -y libraries-1.0 views-3.7 devel-1.x
drupal7_po_download "${CIVICRM_LOCALES:-de_DE}" drupal-7.x views-7.x-3.x devel-7.x-1.x
drush dl -y libraries-1.0 views-3.7
drupal7_po_download "${CIVICRM_LOCALES:-de_DE}" drupal-7.x views-7.x-3.x
popd
3 changes: 1 addition & 2 deletions app/config/drupal10-clean/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
3 changes: 1 addition & 2 deletions app/config/drupal10-empty/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion app/config/drupal8-clean/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ drush8 -y dl drupal-${CMS_VERSION} --destination="$WEB_ROOT" --drupal-project-re
mv "$WEB_ROOT/drupal" "$WEB_ROOT/web"

pushd "$WEB_ROOT/web" >> /dev/null
drush8 dl -y devel-1 libraries userprotect
drush8 dl -y libraries userprotect
composer_allow_common_plugins
composer update psr/log ## Some D8 builds are too specific
## Some D8 builds include a specific revision of phpunit, but Civi uses standalone phpunit (PHAR)
Expand Down
3 changes: 0 additions & 3 deletions app/config/drupal8-demo/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@ 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
## Some D8 builds include a specific revision of phpunit, but Civi uses standalone phpunit (PHAR)
if composer info | grep -q ^phpunit/phpunit\ ; then
composer config "discard-changes" true ## Weird. phpcs has changes which interfere with other work.
composer remove phpunit/phpunit
composer install --no-dev --no-interaction
fi
civicrm_download_composer_d8
git clone "${CACHE_DIR}/civicrm/civivolunteer.git" -b "$VOL_VERSION" vendor/civicrm/civicrm-core/tools/extensions/civivolunteer
git clone "${CACHE_DIR}/ginkgostreet/org.civicrm.angularprofiles.git" -b "$NG_PRFL_VERSION" vendor/civicrm/civicrm-core/tools/extensions/org.civicrm.angularprofiles
git clone "${CACHE_DIR}/civicrm/org.civicoop.civirules.git" -b "$RULES_VERSION" vendor/civicrm/civicrm-core/tools/extensions/org.civicoop.civirules
git clone "${CACHE_DIR}/TechToThePeople/civisualize.git" -b "master" vendor/civicrm/civicrm-core/tools/extensions/civisualize
git clone "${CACHE_DIR}/civicrm/org.civicrm.module.cividiscount.git" -b "$DISC_VERSION" vendor/civicrm/civicrm-core/tools/extensions/cividiscount
Expand Down
14 changes: 0 additions & 14 deletions app/config/drupal8-demo/drush.make.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,6 @@ libraries[api4][download][url] = %%CACHE_DIR%%/civicrm/api4.git
libraries[api4][download][branch] = master
libraries[api4][overwrite] = TRUE

libraries[civivolunteer][destination] = libraries
libraries[civivolunteer][directory_name] = civicrm/tools/extensions/civivolunteer
libraries[civivolunteer][download][type] = git
libraries[civivolunteer][download][url] = %%CACHE_DIR%%/civicrm/civivolunteer.git
libraries[civivolunteer][download][branch] = %%VOL_VERSION%%
libraries[civivolunteer][overwrite] = TRUE

libraries[ng_profiles][destination] = libraries
libraries[ng_profiles][directory_name] = civicrm/tools/extensions/org.civicrm.angularprofiles
libraries[ng_profiles][download][type] = git
libraries[ng_profiles][download][url] = %%CACHE_DIR%%/ginkgostreet/org.civicrm.angularprofiles.git
libraries[ng_profiles][download][branch] = %%NG_PRFL_VERSION%%
libraries[ng_profiles][overwrite] = TRUE

libraries[civisualize][destination] = libraries
libraries[civisualize][directory_name] = civicrm/tools/extensions/civisualize
libraries[civisualize][download][type] = git
Expand Down
14 changes: 0 additions & 14 deletions app/config/drupal8-demo/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,25 +82,11 @@ pushd "${CMS_ROOT}/sites/${DRUPAL_SITE_DIR}" >> /dev/null
drush8 -y rap demoadmin 'access toolbar,administer CiviCase,access all cases and activities,access my cases and activities,add cases,delete in CiviCase,administer CiviCampaign,manage campaign,reserve campaign contacts,release campaign contacts,interview campaign contacts,gotv campaign contacts,sign CiviCRM Petition,access CiviGrant,edit grants, delete in CiviGrant'

# Move extensions into web accessible areas
if [ -d "$CIVI_CORE/tools/extensions/org.civicrm.angularprofiles" ]; then
mv $CIVI_CORE/tools/extensions/org.civicrm.angularprofiles files/civicrm/ext
fi
if [ -d "$CIVI_CORE/tools/extensions/org.civicrm.contactlayout" ]; then
mv $CIVI_CORE/tools/extensions/org.civicrm.contactlayout files/civicrm/ext
fi
if [ -d "$CIVI_CORE/tools/extensions/civivolunteer" ]; then
mv $CIVI_CORE/tools/extensions/civivolunteer files/civicrm/ext
fi
cv api extension.refresh

## Setup demo extensions
cv en --ignore-missing $CIVI_DEMO_EXTS
if [[ "$CIVI_DEMO_EXTS" =~ volunteer ]]; then
drush8 -y rap anonymous 'register to volunteer'
drush8 -y rap authenticated 'register to volunteer'
drush8 -y rap demoadmin 'create volunteer projects,edit own volunteer projects,edit all volunteer projects,log own hours,edit volunteer project relationships,edit volunteer registration profiles,delete own volunteer projects,delete all volunteer projects'
fi

## Demo sites always disable email and often disable cron
drush8 cvapi StatusPreference.create ignore_severity=critical name=checkOutboundMail
drush8 cvapi StatusPreference.create ignore_severity=critical name=checkLastCron
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal8-den/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ drush8 -y dl drupal-${CMS_VERSION} --destination="$WEB_ROOT" --drupal-project-re
mv "$WEB_ROOT/drupal" "$WEB_ROOT/web"

pushd "$WEB_ROOT/web" >> /dev/null
drush8 dl -y devel-1 libraries userprotect
drush8 dl -y libraries userprotect

#### Ideally...
## composer require civicrm/civicrm-asset-plugin:'~1.0.0' civicrm/civicrm-{core,packages,drupal-8}:"$CIVI_VERSION_COMP" --prefer-source
Expand Down
2 changes: 1 addition & 1 deletion app/config/drupal8-empty/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ drush8 -y dl drupal-${CMS_VERSION} --destination="$WEB_ROOT" --drupal-project-re
mv "$WEB_ROOT/drupal" "$WEB_ROOT/web"

pushd "$WEB_ROOT/web"
drush8 dl -y devel-1 libraries
drush8 dl -y libraries
popd
3 changes: 1 addition & 2 deletions app/config/drupal9-clean/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ 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
## Some D8 builds include a specific revision of phpunit, but Civi uses standalone phpunit (PHAR)
if composer info | grep -q ^phpunit/phpunit\ ; then
composer config "discard-changes" true ## Weird. phpcs has changes which interfere with other work.
composer remove --dev drupal/core-dev
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.0.x
drupal8_po_download "${CIVICRM_LOCALES:-de_DE}" "drupal-$( _drupalx_version x.y ).x"
civicrm_download_composer_d8
popd >> /dev/null
5 changes: 1 addition & 4 deletions app/config/drupal9-demo/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,15 @@ 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
## Some D8 builds include a specific revision of phpunit, but Civi uses standalone phpunit (PHAR)
if composer info | grep -q ^phpunit/phpunit\ ; then
composer config "discard-changes" true ## Weird. phpcs has changes which interfere with other work.
composer remove --dev drupal/core-dev
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.0.x
drupal8_po_download "${CIVICRM_LOCALES:-de_DE}" "drupal-$( _drupalx_version x.y ).x"
civicrm_download_composer_d8
git clone "${CACHE_DIR}/civicrm/civivolunteer.git" -b "$VOL_VERSION" vendor/civicrm/civicrm-core/tools/extensions/civivolunteer
git clone "${CACHE_DIR}/ginkgostreet/org.civicrm.angularprofiles.git" -b "$NG_PRFL_VERSION" vendor/civicrm/civicrm-core/tools/extensions/org.civicrm.angularprofiles
git clone "${CACHE_DIR}/civicrm/org.civicoop.civirules.git" -b "$RULES_VERSION" vendor/civicrm/civicrm-core/tools/extensions/org.civicoop.civirules
git clone "${CACHE_DIR}/TechToThePeople/civisualize.git" -b "master" vendor/civicrm/civicrm-core/tools/extensions/civisualize
git clone "${CACHE_DIR}/civicrm/org.civicrm.module.cividiscount.git" -b "$DISC_VERSION" vendor/civicrm/civicrm-core/tools/extensions/cividiscount
Expand Down
Loading

0 comments on commit 9637069

Please sign in to comment.