discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d279918174947793b8f3d6880804eb60648c779f
commit d279918174947793b8f3d6880804eb60648c779f
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Thu Jul 12 09:17:35 2018 -0400
ci: set number of make jobs globally and decrease to 5 jobs
Summary:
travis docs explicitly state that the expectation for builds is to have
2 cpus, meaning that 10 jobs is wayyyy too many and was actually causing
some build failures due to strain on the virtual hw
this sets the number of jobs using a global variable to avoid having to set
it separately for each build
https://docs.travis-ci.com/user/reference/overview/#Virtualization-environments
Reviewers: devilhorns, ManMower
Reviewed By: ManMower
Subscribers: ManMower, cedric, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D6558
---
.ci/ci-linux-build.sh | 28 +++++++++++++---------------
.ci/ci-osx-build.sh | 7 +++----
.travis.yml | 19 +++++++++++--------
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/.ci/ci-linux-build.sh b/.ci/ci-linux-build.sh
index cb5e7e4a24..ddc33fef50 100755
--- a/.ci/ci-linux-build.sh
+++ b/.ci/ci-linux-build.sh
@@ -2,8 +2,6 @@
set -e
-PARALLEL_JOBS=10
-
CI_BUILD_TYPE=$1
DEFAULT_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings"
@@ -32,34 +30,34 @@ RELEASE_READY_COPTS="--with-profile=release"
if [ "$CI_BUILD_TYPE" = "" ]; then
# Normal build test of all targets
./autogen.sh $DEFAULT_COPTS
- make -j $PARALLEL_JOBS
- make -j $PARALLEL_JOBS check-build
- make -j $PARALLEL_JOBS examples
- make -j $PARALLEL_JOBS benchmark
- make -j $PARALLEL_JOBS install
+ make
+ make check-build
+ make examples
+ make benchmark
+ make install
./.ci/build-efl-app.sh
fi
if [ "$CI_BUILD_TYPE" = "wayland" ]; then
./autogen.sh $WAYLAND_COPTS
- make -j $PARALLEL_JOBS
- make -j $PARALLEL_JOBS examples
+ make
+ make examples
fi
if [ "$CI_BUILD_TYPE" = "misc" ]; then
./autogen.sh $MISC_COPTS
- make -j $PARALLEL_JOBS
- make -j $PARALLEL_JOBS examples
+ make
+ make examples
fi
if [ "$CI_BUILD_TYPE" = "misc-disabled" ]; then
./autogen.sh $MISC_DISABLED_COPTS
- make -j $PARALLEL_JOBS
- make -j $PARALLEL_JOBS examples
+ make
+ make examples
fi
if [ "$CI_BUILD_TYPE" = "release-ready" ]; then
./autogen.sh $RELEASE_READY_COPTS
- make -j $PARALLEL_JOBS
- make -j $PARALLEL_JOBS distcheck
+ make
+ make distcheck
fi
diff --git a/.ci/ci-osx-build.sh b/.ci/ci-osx-build.sh
index 6195c535b9..4e7a0f05cc 100755
--- a/.ci/ci-osx-build.sh
+++ b/.ci/ci-osx-build.sh
@@ -3,7 +3,6 @@
set -e
COPTS="--disable-cxx-bindings"
-PARALLEL_JOBS=10
# Prepare OSX env for build
mkdir -p ~/Library/LaunchAgents
@@ -16,6 +15,6 @@ export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
# Normal build test of all targets
./autogen.sh $COPTS $@
-make -j $PARALLEL_JOBS
-make -j $PARALLEL_JOBS examples
-#make -j $PARALLEL_JOBS benchmark
+make
+make examples
+#make benchmark
diff --git a/.travis.yml b/.travis.yml
index dfe16b8292..60a3658b8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,17 @@ os:
- osx
env:
- -
- - DISTRO=Ubuntu1804
- - DISTRO=Fedora28 CI_BUILD_TYPE=wayland
- - DISTRO=Fedora28 CI_BUILD_TYPE=misc
- - DISTRO=Fedora28 CI_BUILD_TYPE=misc-disabled
- - DISTRO=Fedora28 CI_BUILD_TYPE=release-ready
- - DISTRO=Debian91
- - DISTRO=Archlinux
+ global:
+ - MAKEFLAGS="-j5"
+ matrix:
+ -
+ - DISTRO=Ubuntu1804
+ - DISTRO=Fedora28 CI_BUILD_TYPE=wayland
+ - DISTRO=Fedora28 CI_BUILD_TYPE=misc
+ - DISTRO=Fedora28 CI_BUILD_TYPE=misc-disabled
+ - DISTRO=Fedora28 CI_BUILD_TYPE=release-ready
+ - DISTRO=Debian91
+ - DISTRO=Archlinux
services:
- docker
--
