Merge pull request #8161 from open-sausages/pulls/3.7/cleanup-travis-builds

Simplify travis builds
This commit is contained in:
Robbie Averill 2018-06-19 21:30:56 +12:00 committed by GitHub
commit ce4186dcaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -12,25 +12,17 @@ addons:
matrix: matrix:
include: include:
- php: 7.2
env: DB=MYSQL PDO=1
- php: 5.3
env: DB=MYSQL
- php: 5.4 - php: 5.4
env: DB=PGSQL
- php: 5.5
env: DB=SQLITE
- php: 5.6
env: DB=MYSQL PDO=1 env: DB=MYSQL PDO=1
- php: 7.0 - php: 7.0
env: DB=MYSQL env: DB=SQLITE
- php: 7.1 - php: 7.2
env: DB=MYSQL PDO=1 env: DB=PGSQL
- php: 5.6 - php: 5.6
env: DB=MYSQL BEHAT_TEST=1 env: DB=MYSQL BEHAT_TEST=1
- php: 7.0 - php: 5.5
env: DB=MYSQL CMS_TEST=1 env: DB=MYSQL CMS_TEST=1
- php: 7.0 - php: 7.1
env: DB=MYSQL BEHAT_TEST=1 CMS_TEST=1 env: DB=MYSQL BEHAT_TEST=1 CMS_TEST=1
before_script: before_script:
@ -59,10 +51,3 @@ script:
after_failure: after_failure:
- php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_KEY --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ - php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_KEY --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/
branches:
except:
- 2.1
- 2.2
- 2.3
- translation-staging