Skip to content
This repository was archived by the owner on Aug 8, 2024. It is now read-only.

Commit a534d3c

Browse files
Ensure that all calls to composer and terminus are non-interactive. Move the '-n' flag to the front of the argument list for clarity. (#99)
1 parent a58920d commit a534d3c

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

circle.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,44 +37,44 @@ dependencies:
3737
- echo "Begin build for $CIRCLE_ENV${PR_ENV:+ for }$PR_ENV. Pantheon test environment is $TERMINUS_SITE.$TERMINUS_ENV"
3838
- |
3939
if [ -n "$GITHUB_TOKEN" ] ; then
40-
composer config --global github-oauth.github.com $GITHUB_TOKEN
40+
composer -n config --global github-oauth.github.com $GITHUB_TOKEN
4141
fi
4242
- git config --global user.email "$GIT_EMAIL"
4343
- git config --global user.name "Circle CI"
4444
- git config --global core.fileMode false
4545
override:
46-
- composer global require -n "hirak/prestissimo:^0.3"
47-
- /usr/bin/env COMPOSER_BIN_DIR=$HOME/bin composer --working-dir=$HOME require pantheon-systems/terminus "^1"
48-
- terminus --version
49-
- /usr/bin/env COMPOSER_BIN_DIR=$HOME/bin composer --working-dir=$HOME require drush/drush "^8"
46+
- composer -n global require -n "hirak/prestissimo:^0.3"
47+
- /usr/bin/env COMPOSER_BIN_DIR=$HOME/bin composer -n --working-dir=$HOME require pantheon-systems/terminus "^1"
48+
- terminus -n --version
49+
- /usr/bin/env COMPOSER_BIN_DIR=$HOME/bin composer -n --working-dir=$HOME require drush/drush "^8"
5050
- mkdir -p ~/.terminus/plugins
51-
- composer create-project -n -d ~/.terminus/plugins pantheon-systems/terminus-build-tools-plugin:$BUILD_TOOLS_VERSION
52-
- composer create-project -n -d ~/.terminus/plugins pantheon-systems/terminus-secrets-plugin:^1
51+
- composer -n create-project -d ~/.terminus/plugins pantheon-systems/terminus-build-tools-plugin:$BUILD_TOOLS_VERSION
52+
- composer -n create-project -d ~/.terminus/plugins pantheon-systems/terminus-secrets-plugin:^1
5353
post:
54-
- terminus auth:login -n --machine-token="$TERMINUS_TOKEN"
55-
- terminus build:env:delete:ci -n "$TERMINUS_SITE" --keep=2 --yes
54+
- terminus -n auth:login --machine-token="$TERMINUS_TOKEN"
55+
- terminus -n build:env:delete:ci "$TERMINUS_SITE" --keep=2 --yes
5656
- composer -n build-assets
57-
- terminus env:wake -n "$TERMINUS_SITE.dev"
58-
- terminus build:env:create -n "$TERMINUS_SITE.dev" "$TERMINUS_ENV" --yes --clone-content --db-only --notify="$NOTIFY"
59-
- terminus drush -n "$TERMINUS_SITE.$TERMINUS_ENV" -- updatedb -y
57+
- terminus -n env:wake "$TERMINUS_SITE.dev"
58+
- terminus -n build:env:create "$TERMINUS_SITE.dev" "$TERMINUS_ENV" --yes --clone-content --db-only --notify="$NOTIFY"
59+
- terminus -n drush "$TERMINUS_SITE.$TERMINUS_ENV" -- updatedb -y
6060
- |
61-
[ ! -f "config/system.site.yml" ] || terminus drush "$TERMINUS_SITE.$TERMINUS_ENV" -- config-import --yes
61+
[ ! -f "config/system.site.yml" ] || terminus -n drush "$TERMINUS_SITE.$TERMINUS_ENV" -- config-import --yes
6262
# Optional: replace lines above with lines below to re-install Drupal for every test.
63-
# - terminus build:env:create -n "$TERMINUS_SITE.dev" "$TERMINUS_ENV" --yes --notify="$NOTIFY"
64-
# - terminus build:env:install -n "$TERMINUS_SITE.$TERMINUS_ENV" --site-name="$TEST_SITE_NAME" --account-mail="$ADMIN_EMAIL" --account-pass="$ADMIN_PASSWORD"
63+
# - terminus -n build:env:create "$TERMINUS_SITE.dev" "$TERMINUS_ENV" --yes --notify="$NOTIFY"
64+
# - terminus -n build:env:install "$TERMINUS_SITE.$TERMINUS_ENV" --site-name="$TEST_SITE_NAME" --account-mail="$ADMIN_EMAIL" --account-pass="$ADMIN_PASSWORD"
6565
6666
test:
6767
override:
6868
- run-behat
6969
post:
70-
- terminus secrets:set -n "$TERMINUS_SITE.$TERMINUS_ENV" token "$GITHUB_TOKEN" --file='github-secrets.json' --clear --skip-if-empty
70+
- terminus -n secrets:set "$TERMINUS_SITE.$TERMINUS_ENV" token "$GITHUB_TOKEN" --file='github-secrets.json' --clear --skip-if-empty
7171

7272
deployment:
7373
build-assets:
7474
branch: master
7575
commands:
76-
- terminus build:env:merge -n "$TERMINUS_SITE.$TERMINUS_ENV" --yes
77-
- terminus drush -n $TERMINUS_SITE.dev -- updatedb --yes
76+
- terminus -n build:env:merge "$TERMINUS_SITE.$TERMINUS_ENV" --yes
77+
- terminus -n drush $TERMINUS_SITE.dev -- updatedb --yes
7878
- |
79-
[ ! -f "config/system.site.yml" ] || terminus drush "$TERMINUS_SITE.dev" -- config-import --yes
80-
- terminus build:env:delete:pr -n "$TERMINUS_SITE" --yes
79+
[ ! -f "config/system.site.yml" ] || terminus -n drush "$TERMINUS_SITE.dev" -- config-import --yes
80+
- terminus -n build:env:delete:pr "$TERMINUS_SITE" --yes

0 commit comments

Comments
 (0)