diff options
| author | Björn Gustavsson <[email protected]> | 2017-06-30 13:31:26 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-06-30 13:31:26 +0200 |
| commit | 880d6dff17702f963622ba64731bbb11dd5cf159 (patch) | |
| tree | 4c1e0d590569ba7ce21ac61b90447947c3ee3538 | |
| parent | 8be7e905e34a954938fa9b01f37c0e0d85b7000c (diff) | |
| parent | 63969565f797c3ae291c6d71aff52cd254e177e3 (diff) | |
| download | otp-880d6dff17702f963622ba64731bbb11dd5cf159.tar.gz otp-880d6dff17702f963622ba64731bbb11dd5cf159.tar.bz2 otp-880d6dff17702f963622ba64731bbb11dd5cf159.zip | |
Merge branch 'maint'
* maint:
Travis CI: Fix the build matrix
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index eee75c9769..88a4c46f77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,8 +28,18 @@ matrix: - docker script: - ./scripts/build-docker-otp 32 sh -c "scripts/build-otp && ./otp_build tests && scripts/run-smoke-tests && bin/dialyzer --build_plt --apps erts kernel stdlib" - after_success: - after_script: + - env: Linux64Dialyzer + os: linux + script: + - ./scripts/build-otp + - ./scripts/run-dialyzer + - env: Linux64SmokeTest + os: linux + script: + - ./scripts/build-otp + - ./otp_build tests + - make release_docs + - ./scripts/run-smoke-tests before_script: - set -e @@ -37,13 +47,3 @@ before_script: - export PATH=$ERL_TOP/bin:$PATH - export ERL_LIBS='' - export MAKEFLAGS=-j4 - -script: - - ./scripts/build-otp - -after_success: - - ./scripts/run-dialyzer - - ./otp_build tests && make release_docs - -after_script: - - ./scripts/run-smoke-tests |