From df43cf3ad3b64d807e1702c14f91ab3fb6c9b156 Mon Sep 17 00:00:00 2001 From: Matthew Grasmick Date: Fri, 3 Jun 2016 19:13:32 -0400 Subject: [PATCH] Fixing incorrect references to bolt. --- .travis.yml | 6 +++--- build/phing/build.xml | 2 +- template/scripts/blt/update-scaffold | 8 ++++---- template/scripts/tugboat/build.sh | 2 +- template/scripts/tugboat/init.sh | 2 +- template/scripts/tugboat/update.sh | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index d58cca560..8a82c5536 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,8 @@ addons: - svn-5223.devcloud.hosting.acquia.com before_install: - # Decrypt private SSH key id_rsa_bolt.enc, save as ~/.ssh/id_rsa_bolt. - - if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then openssl aes-256-cbc -K $encrypted_665bd7a0b921_key -iv $encrypted_665bd7a0b921_iv -in id_rsa_bolt.enc -out ~/.ssh/id_rsa_bolt -d; chmod 600 ~/.ssh/id_rsa_bolt; fi + # Decrypt private SSH key id_rsa_blt.enc, save as ~/.ssh/id_rsa_blt. + - if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then openssl aes-256-cbc -K $encrypted_665bd7a0b921_key -iv $encrypted_665bd7a0b921_iv -in id_rsa_blt.enc -out ~/.ssh/id_rsa_blt -d; chmod 600 ~/.ssh/id_rsa_blt; fi - nvm install 0.12 - nvm use 0.12 - composer selfupdate @@ -60,7 +60,7 @@ script: deploy: provider: script - script: ../bolted8/bolt.sh deploy:artifact -Ddeploy.commitMsg="Automated commit by Travis CI for Build ${TRAVIS_BUILD_ID}" -Ddeploy.branch="8.x-build" && phpunit tests/phpunit --group=deploy + script: ../blted8/blt.sh deploy:artifact -Ddeploy.commitMsg="Automated commit by Travis CI for Build ${TRAVIS_BUILD_ID}" -Ddeploy.branch="8.x-build" && phpunit tests/phpunit --group=deploy skip_cleanup: true on: branch: 8.x diff --git a/build/phing/build.xml b/build/phing/build.xml index ada5f581f..5b90f17fa 100644 --- a/build/phing/build.xml +++ b/build/phing/build.xml @@ -1,4 +1,4 @@ - diff --git a/template/scripts/blt/update-scaffold b/template/scripts/blt/update-scaffold index 6726bd082..fd998ed64 100755 --- a/template/scripts/blt/update-scaffold +++ b/template/scripts/blt/update-scaffold @@ -1,10 +1,10 @@ #!/bin/bash -e GIT_ROOT=$(git rev-parse --show-toplevel) -BOLT_BRANCH=8.x +BLT_BRANCH=8.x # Upstream directories to pull. These will be prefixed with "template/". -BOLT_DIRS=( +BLT_DIRS=( "blt.sh" "build/core" "drush.wrapper" @@ -25,9 +25,9 @@ cd $GIT_ROOT echo "Copying down upstream changes to the BLT template." # Iteratively pull down upstream directories. -for i in "${BOLT_DIRS[@]}" +for i in "${BLT_DIRS[@]}" do - svn export https://github.com/acquia/blt/branches/$BOLT_BRANCH/template/$i $i --force + svn export https://github.com/acquia/blt/branches/$BLT_BRANCH/template/$i $i --force done # Restore execute permissions. diff --git a/template/scripts/tugboat/build.sh b/template/scripts/tugboat/build.sh index 4527aa709..7dc6f1454 100755 --- a/template/scripts/tugboat/build.sh +++ b/template/scripts/tugboat/build.sh @@ -3,4 +3,4 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) # Update current database to reflect the state of the Drupal file system -$DIR/../../bolt.sh ci:update +$DIR/../../blt.sh ci:update diff --git a/template/scripts/tugboat/init.sh b/template/scripts/tugboat/init.sh index 384f77ec4..520e7714c 100755 --- a/template/scripts/tugboat/init.sh +++ b/template/scripts/tugboat/init.sh @@ -11,4 +11,4 @@ composer install $DIR/install-node.sh 4.4.1 -$DIR/../../bolt.sh ci:setup +$DIR/../../blt.sh ci:setup diff --git a/template/scripts/tugboat/update.sh b/template/scripts/tugboat/update.sh index 0fe898e0a..1fe1f274c 100755 --- a/template/scripts/tugboat/update.sh +++ b/template/scripts/tugboat/update.sh @@ -5,4 +5,4 @@ cd /var/lib/tugboat/docroot chown -R www-data sites/default/files # Update current database to reflect the state of the Drupal file system -$DIR/../../bolt.sh ci:update +$DIR/../../blt.sh ci:update