aboutsummaryrefslogtreecommitdiffstats
path: root/.ci
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-07-12 09:17:35 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-07-12 09:17:36 -0400
commitd279918174947793b8f3d6880804eb60648c779f (patch)
tree7285ec9e46af6707ae89083180c67e0d1fc7edff /.ci
parentecore: fix order of signal fd shutdown (diff)
downloadefl-d279918174947793b8f3d6880804eb60648c779f.tar.gz
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
Diffstat (limited to '.ci')
-rwxr-xr-x.ci/ci-linux-build.sh28
-rwxr-xr-x.ci/ci-osx-build.sh7
2 files changed, 16 insertions, 19 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