Merge pull request #1446 from tractorcow/pulls/4.0/travis-artifacts

API Update to use new travis-artifacts
This commit is contained in:
Ingo Schommer 2016-04-06 09:17:58 +12:00
commit 3d2f722231

View File

@ -13,10 +13,10 @@ addons:
env: env:
global: global:
- CORE_RELEASE=master - CORE_RELEASE=master
- "ARTIFACTS_AWS_REGION=us-east-1" - ARTIFACTS_REGION=us-east-1
- "ARTIFACTS_S3_BUCKET=silverstripe-travis-artifacts" - ARTIFACTS_BUCKET=silverstripe-travis-artifacts
- secure: "7V20Qk3bIG2AlTJaA5D/uzB8vUVvRwQp+xjRYUxlahtj9FcuqEV3HIyjwwJe0T6Z1bnRYuu28ZnCT2CfP9BBZ3FE7AwSZbPase9c0/at2qDJNqkvIdC1xZ1H6Fcy2LSwNB9wLQPe613ItVdanitEuwE41iowxBPslxUUTnwx7eY=" - secure: "uql39x7U1QSn1PXeGCgkREOWt9avvedfNI/CF5ESeSnlpuLLKVmZcQ4V1kCO0/0K0WbBb9tMyC4we6KDccZFwhqPqmFD2q0m76CISz8eduEWoSU1HFfWzkGKfUbe1sVWZtr/zqLjrjrbXKxwnieK2HxXEw9nUmMLCUXvg9gShiQ="
- secure: "f/GWlbnNri2YpCOrJfZl7tkhpMmcRVUbCdmb+beAY90gFBJQPHtljzf8M4KaCP0OkLOtRFuGoMFdIcpadl4J6IG1XP18IJNz+nKzCL/sJj/FF9y77RdMHWE9jr21G9ar5tywkn7JM6vrnTCY89OnHeQx67SKvxqX5CpVx+rdcEU=" - secure: "0AL85od1+sMZ/cDyIcehVTGULy0n7IaYmVqJ2mDjbmcRkBx/LwTB9nWxcAgQmP0jt01N6Bjwy2vpBwmR0r0nOJYkUpHOv63F0qkhYVjjLRffwhw7nGbKW4HViTLfF0AfZaj3IErGsEWzpTbo0QOZvHI1OsWPTbQEIXyuZPV9nBk="
matrix: matrix:
include: include:
@ -48,7 +48,7 @@ script:
- "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @cms; fi" - "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @cms; fi"
after_failure: after_failure:
- php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_AWS_SECRET_ACCESS_KEY --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_S3_BUCKET/ - php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/
branches: branches:
except: except: