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

use trusty container in travis-ci; use "artifacts" addon #2625

Merged
merged 2 commits into from
Dec 3, 2016
Merged
Show file tree
Hide file tree
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
15 changes: 7 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# in order to use 'trusty' dist, need this.
# see https://docs.travis-ci.com/user/trusty-ci-environment/
sudo: required
sudo: false

# trust dist provides a modern build chain (as opposed to 'precise' dist)
# which absolves us from having to install compilers and stuff
Expand All @@ -13,9 +11,6 @@ env:
# phantomjs hosts binaries @ bitbucket, which has fairly restrictive
# rate-limiting. pull it from this sketchy site in China instead.
- PHANTOMJS_CDNURL='https://cnpmjs.org/downloads'
# we're going to use s3 to temporarily store Karma test bundles for debugging
- AWS_ACCESS_KEY_ID=AKIAJ3QQTLQXWXYJ6PTA
- secure: k4musDC734E1NFOWaY5qb/l0B9K1cfusFTvMZFayTMs5ubKjeNYCgct2sDSvO5tO7Un935I0sYOOSRPvANPhs8dP1a/8/x0PnwIfnpoCFQCCaI0bWnIQj7nOZ2TaEB/fngZCerCFpNDlzqI6BmaR+XoMvA74v2YD/vVXnzvXNQk=

matrix:
fast_finish: true
Expand Down Expand Up @@ -47,11 +42,15 @@ before_script: scripts/travis-before-script.sh

script: make $TARGET

after_script: scripts/travis-after-script.sh

notifications:
urls:
# for gitter
- secure: fUrHenYJs+pTuLtgBRoYyrlyfVekxaIGmLWq7bhUUqBj/7p5eCkQFn13LlPht0/4WWZOiPBcdTN7tKnz3Ho7ATUJhAchvOWDUgL5gtTvOzeCHbPuCvHz/VLK6hMoPdbLA45M864NDLotfHvyh62WgQaVw9iPc80eb+umaDPrYiU=
on_success: change
on_failure: always

addons:
artifacts:
paths:
- .karma/
- ./mocha.js
9 changes: 0 additions & 9 deletions scripts/travis-after-script.sh

This file was deleted.

6 changes: 1 addition & 5 deletions scripts/travis-before-script.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#!/usr/bin/env bash
# installs awscli from pip if $S3 is set

if [ ${S3} ]
then
sudo pip install awscli
fi
mkdir -p .karma