summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml55
1 files changed, 38 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 5a87bd3fd1..b94af2281a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,24 @@ matrix:
script:
- ./scripts/build-otp
- ./scripts/run-dialyzer
-
+ # Doc build second as it also takes a long time to run
+ - env: Linux64Docbuild
+ script:
+ - ./scripts/build-otp docs
+ deploy:
+ provider: pages
+ repo: erlang/cd
+ target-branch: master
+ skip-cleanup: true
+ keep-history: false
+ verbose: true
+ github-token: $ERLANG_CD_GITHUB_TOKEN
+ on:
+ # We only deploy on pushes to branches
+ all_branches: true
+ tags: false
+ condition: $TRAVIS_PULL_REQUEST = "false"
+ repo: erlang/otp
- env: Linux32
services:
- docker
@@ -70,23 +87,27 @@ matrix:
- xsltproc
- libxml2-utils
- - env: Linux64Docbuild
+ - env: Linux-s390x-SmokeTest
+ arch: s390x
script:
- - ./scripts/build-otp docs
- deploy:
- provider: pages
- repo: erlang/cd
- target-branch: master
- skip-cleanup: true
- keep-history: false
- verbose: true
- github-token: $ERLANG_CD_GITHUB_TOKEN
- on:
- # We only deploy on pushes to branches
- all_branches: true
- tags: false
- condition: $TRAVIS_PULL_REQUEST = "false"
- repo: erlang/otp
+ - ./scripts/build-otp
+ - ./otp_build tests
+ - ./scripts/run-smoke-tests
+ addons:
+ apt:
+ update: true
+ packages:
+ - autoconf
+ - libncurses-dev
+ - build-essential
+ - libssl-dev
+ - libwxgtk3.0-dev
+ - libglu1-mesa-dev
+ - default-jdk
+ - g++
+ - xsltproc
+ - libxml2-utils
+
# This stage publishes a otp bundle that contains multiple
# Erlang/OTP source repositories
- stage: deploy