From 3a40993d69a9079f7c890bc365a5f74c96287815 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 7 Mar 2017 10:11:25 +0100
Subject: Travis CI: Change the language to C

We never use the installed Erlang package. Setting the language
to C could also allow us to build on platforms that don't support
the Erlang language (e.g. osx).
---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index baa55b383d..414107e10f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,10 @@
-language: erlang
-
-otp_release:
-  - 18.0
+language: c
 
 sudo: false
 
+os:
+  - linux
+
 addons:
   apt:
     packages:
@@ -26,7 +26,6 @@ before_script:
   - export PATH=$ERL_TOP/bin:$PATH
   - export ERL_LIBS=''
   - export MAKEFLAGS=-j6
-  - kerl_deactivate
 
 script:
   - ./scripts/build-otp
-- 
cgit v1.2.3


From cc96d254379776c83aa85bad397a24fc4365c5c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 7 Mar 2017 11:54:39 +0100
Subject: Reduce number of jobs for make

Running fewer jobs in parallel reduces the risk of running out
of memory.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 414107e10f..8fc3478379 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ before_script:
   - export ERL_TOP=$PWD
   - export PATH=$ERL_TOP/bin:$PATH
   - export ERL_LIBS=''
-  - export MAKEFLAGS=-j6
+  - export MAKEFLAGS=-j4
 
 script:
   - ./scripts/build-otp
-- 
cgit v1.2.3


From b5a5591678140206d86177d0e2df8dbfad825184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 7 Mar 2017 11:33:59 +0100
Subject: Travis CI: Add building of Erlang/OTP on 32-bit Linux

Build Erlang and run smoke test in a Docker container running
32-bit Linxux.
---
 .travis.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 8fc3478379..dfa01a89e6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,17 @@ addons:
       - g++
       - xsltproc
 
+matrix:
+  include:
+    - env: Linux32
+      os: linux
+      services:
+        - docker
+      script:
+        - ./scripts/build-docker-otp 32 sh -c "scripts/build-otp && ./otp_build tests && scripts/run-smoke-tests"
+      after_success:
+      after_script:
+
 before_script:
   - set -e
   - export ERL_TOP=$PWD
@@ -29,7 +40,7 @@ before_script:
 
 script:
   - ./scripts/build-otp
-  
+
 after_success:
   - $ERL_TOP/bin/dialyzer --build_plt --apps asn1 compiler crypto dialyzer edoc erts et hipe inets kernel mnesia observer public_key runtime_tools snmp ssh ssl stdlib syntax_tools wx xmerl --statistics
   - $ERL_TOP/bin/dialyzer -n -Wunknown -Wunmatched_returns --apps compiler erts kernel stdlib asn1 crypto dialyzer hipe parsetools public_key runtime_tools sasl tools --statistics
-- 
cgit v1.2.3