Skip to content

Commit

Permalink
Improve messaging (#80)
Browse files Browse the repository at this point in the history
(cherry picked from commit 529a784)
  • Loading branch information
alexpott authored May 15, 2024
1 parent bcc4b69 commit 893fb7d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/stages/prepare_old_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ _stage_prepare_old_install() {
fi

# Checkout the profile and get the version we want to upgrade from.
printf "Checking out ${DRUPAL_TESTING_UPGRADE_VERSION}\n\n"
mkdir -p ${DRUPAL_TESTING_UPGRADE_DRUPAL_INSTALLATION_DIRECTORY}
cp -R ${DRUPAL_TESTING_WORKSPACE}/. ${DRUPAL_TESTING_UPGRADE_DRUPAL_INSTALLATION_DIRECTORY}
git -C ${DRUPAL_TESTING_UPGRADE_DRUPAL_INSTALLATION_DIRECTORY} fetch
git -C ${DRUPAL_TESTING_UPGRADE_DRUPAL_INSTALLATION_DIRECTORY} checkout ${DRUPAL_TESTING_UPGRADE_VERSION}

printf "Prepare composer.json\n\n"
printf "Prepare composer.json to install version to upgrade from\n\n"

# Build is based on drupal project
composer create-project "${DRUPAL_TESTING_COMPOSER_PROJECT}":"${DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION}" "${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}" --no-interaction --no-install
Expand Down
2 changes: 2 additions & 0 deletions lib/stages/prepare_upgrade.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ _stage_prepare_upgrade() {
exit 1
fi

printf "Prepare composer.json to upgrade to version under test\n\n"

# Add asset-packagist for projects, that require frontend assets
if ! composer_repository_exists "https://asset-packagist.org"; then
composer config extra."installer-types".0 bower-asset --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}"
Expand Down

0 comments on commit 893fb7d

Please sign in to comment.