aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-06-29 17:12:20 +0200
committerBjörn Gustavsson <[email protected]>2017-06-30 13:00:46 +0200
commit63969565f797c3ae291c6d71aff52cd254e177e3 (patch)
treea6b8eae2fccad3e97d8b1d192a1a4cbdc0b725b8
parent616a495f28783e05a95fd545c4a247f1a9177f81 (diff)
downloadotp-63969565f797c3ae291c6d71aff52cd254e177e3.tar.gz
otp-63969565f797c3ae291c6d71aff52cd254e177e3.tar.bz2
otp-63969565f797c3ae291c6d71aff52cd254e177e3.zip
Travis CI: Fix the build matrix
Some changes in Travis CI resulted in only a build for 32-bit Linux.
-rw-r--r--.travis.yml24
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