Skip to content
Snippets Groups Projects
Commit 5edc3ee9 authored by Travis Carden's avatar Travis Carden Committed by Ted Bowman
Browse files

Issue #3321633 by Wim Leers, TravisCarden, phenaproxima: scripts/*.sh should...

Issue #3321633 by Wim Leers, TravisCarden, phenaproxima: scripts/*.sh should now use 10.0.x as the default branch AND should install require-dev dependencies
parent 77ea670b
No related branches found
No related tags found
No related merge requests found
...@@ -52,8 +52,11 @@ composer config \ ...@@ -52,8 +52,11 @@ composer config \
# Prevent Composer from symlinking path repositories. # Prevent Composer from symlinking path repositories.
export COMPOSER_MIRROR_PATH_REPOS=1 export COMPOSER_MIRROR_PATH_REPOS=1
# Remove the Composer platform PHP emulation. # Remove the Composer platform PHP requirement, but only on Drupal 9.
composer config --unset platform.php CORE_BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [[ "$CORE_BRANCH" =~ 9.* ]]; then
composer config --unset platform.php
fi
# Prevent Composer from installing symlinks from common packages known to # Prevent Composer from installing symlinks from common packages known to
# contain them. # contain them.
...@@ -66,6 +69,11 @@ composer require \ ...@@ -66,6 +69,11 @@ composer require \
--no-ansi \ --no-ansi \
drupal/automatic_updates:*@dev drupal/automatic_updates:*@dev
# `composer install` only installs root package development dependencies. So add
# automatic_updates' development dependencies to the root.
# @see https://getcomposer.org/doc/04-schema.md#require-dev
composer require --dev colinodell/psr-testlogger:^1
# Revert needless changes to Core Composer metapackages. # Revert needless changes to Core Composer metapackages.
git checkout -- "$SITE_DIRECTORY/composer/Metapackage" git checkout -- "$SITE_DIRECTORY/composer/Metapackage"
......
...@@ -24,7 +24,7 @@ safe_realpath() { ...@@ -24,7 +24,7 @@ safe_realpath() {
# your terminal session) to override their default values. # your terminal session) to override their default values.
# @see https://www.serverlab.ca/tutorials/linux/administration-linux/how-to-set-environment-variables-in-linux/ # @see https://www.serverlab.ca/tutorials/linux/administration-linux/how-to-set-environment-variables-in-linux/
# Variables beginning with an underscore (_) cannot be overridden. # Variables beginning with an underscore (_) cannot be overridden.
DRUPAL_CORE_BRANCH=${DRUPAL_CORE_BRANCH:="9.5.x"} DRUPAL_CORE_BRANCH=${DRUPAL_CORE_BRANCH:="10.0.x"}
DRUPAL_CORE_SHALLOW_CLONE=${DRUPAL_CORE_SHALLOW_CLONE:="TRUE"} DRUPAL_CORE_SHALLOW_CLONE=${DRUPAL_CORE_SHALLOW_CLONE:="TRUE"}
AUTOMATIC_UPDATES_BRANCH=${AUTOMATIC_UPDATES_BRANCH:="8.x-2.x"} AUTOMATIC_UPDATES_BRANCH=${AUTOMATIC_UPDATES_BRANCH:="8.x-2.x"}
SITE_DIRECTORY=${SITE_DIRECTORY:="auto_updates_dev"} SITE_DIRECTORY=${SITE_DIRECTORY:="auto_updates_dev"}
...@@ -160,8 +160,11 @@ composer config \ ...@@ -160,8 +160,11 @@ composer config \
# Prevent Composer from symlinking path repositories. # Prevent Composer from symlinking path repositories.
export COMPOSER_MIRROR_PATH_REPOS=1 export COMPOSER_MIRROR_PATH_REPOS=1
# Remove the Composer platform PHP requirement. # Remove the Composer platform PHP requirement, but only on Drupal 9.
composer config --unset platform.php CORE_BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [[ "$CORE_BRANCH" =~ 9.* ]]; then
composer config --unset platform.php
fi
# Prevent Composer from installing symlinks from common packages known to # Prevent Composer from installing symlinks from common packages known to
# contain them. # contain them.
...@@ -174,6 +177,11 @@ composer require \ ...@@ -174,6 +177,11 @@ composer require \
--no-ansi \ --no-ansi \
drupal/automatic_updates:dev-"$AUTOMATIC_UPDATES_BRANCH" drupal/automatic_updates:dev-"$AUTOMATIC_UPDATES_BRANCH"
# `composer install` only installs root package development dependencies. So add
# automatic_updates' development dependencies to the root.
# @see https://getcomposer.org/doc/04-schema.md#require-dev
composer require --dev colinodell/psr-testlogger:^1
# Revert needless changes to Core Composer metapackages. # Revert needless changes to Core Composer metapackages.
git checkout -- "$_SITE_DIRECTORY_REALPATH/composer/Metapackage" git checkout -- "$_SITE_DIRECTORY_REALPATH/composer/Metapackage"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment