Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert Make Travis deployment config consistent #415

Merged
merged 1 commit into from
Mar 7, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ node_js:
- "4.4.7"
before_install:
- npm install -g grunt-cli
- git config --global user.name "Travis CI"
- git config --global user.email "travis@travis-ci.org"
- git remote add origin_ssh git@github.com:alphagov/govuk_elements.git
- 'if [ "$TRAVIS_PULL_REQUEST_BRANCH" = "master" ]; then openssl aes-256-cbc -K $encrypted_85ebe8034b89_key -iv $encrypted_85ebe8034b89_iv -in .travis/govuk_elements.enc -out ~/.ssh/id_rsa -d && chmod 600 ~/.ssh/id_rsa; fi'
- # This openssl command was generated automatically by `travis encrypt-file`, see `.travis/README.md` for more details
install:
- npm install
script:
Expand All @@ -11,11 +16,6 @@ notifications:
email: false
before_deploy:
- test $TRAVIS_TEST_RESULT = 0
- git config --global user.name "Travis CI"
- git config --global user.email "travis@travis-ci.org"
- git remote add origin_ssh git@github.com:alphagov/govuk_elements.git
# This openssl command was generated automatically by `travis encrypt-file`, see `.travis/README.md` for more details
- openssl aes-256-cbc -K $encrypted_85ebe8034b89_key -iv $encrypted_85ebe8034b89_iv -in .travis/govuk_elements.enc -out ~/.ssh/id_rsa -d && chmod 600 ~/.ssh/id_rsa
deploy:
- provider: script
script: './push-version-tag.sh'
Expand Down