Permalink
Browse files

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

* try beta trusty container on travis-ci; closes #2624

* remove unused environment from .travis.yml
  • Loading branch information...
1 parent bb743ff commit c82c49362971855a3cb4b1244ba7df8b3492b6a4 @boneskull boneskull committed on GitHub Dec 3, 2016
Showing with 8 additions and 22 deletions.
  1. +7 −8 .travis.yml
  2. +0 −9 scripts/travis-after-script.sh
  3. +1 −5 scripts/travis-before-script.sh
View
@@ -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
@@ -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
@@ -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
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-# syncs Karma test bundles to S3 if $S3 is set
-
-if [ ${S3} ]
-then
- mkdir -p .karma/${TRAVIS_JOB_NUMBER}
- cp ./mocha.js ".karma/${TRAVIS_JOB_NUMBER}/mocha.js"
- aws s3 sync ".karma/${TRAVIS_JOB_NUMBER}" "s3://mochajs/karma-bundles/${TRAVIS_JOB_NUMBER}"
-fi
@@ -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

0 comments on commit c82c493

Please sign in to comment.