summaryrefslogtreecommitdiff
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
parentf21fd7e2fd396bf62af22655f92e4c38ef62b0e7 (diff)
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 @@
2 2
3set -e 3set -e
4 4
5PARALLEL_JOBS=10
6
7CI_BUILD_TYPE=$1 5CI_BUILD_TYPE=$1
8 6
9DEFAULT_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings" 7DEFAULT_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings"
@@ -32,34 +30,34 @@ RELEASE_READY_COPTS="--with-profile=release"
32if [ "$CI_BUILD_TYPE" = "" ]; then 30if [ "$CI_BUILD_TYPE" = "" ]; then
33 # Normal build test of all targets 31 # Normal build test of all targets
34 ./autogen.sh $DEFAULT_COPTS 32 ./autogen.sh $DEFAULT_COPTS
35 make -j $PARALLEL_JOBS 33 make
36 make -j $PARALLEL_JOBS check-build 34 make check-build
37 make -j $PARALLEL_JOBS examples 35 make examples
38 make -j $PARALLEL_JOBS benchmark 36 make benchmark
39 make -j $PARALLEL_JOBS install 37 make install
40 ./.ci/build-efl-app.sh 38 ./.ci/build-efl-app.sh
41fi 39fi
42 40
43if [ "$CI_BUILD_TYPE" = "wayland" ]; then 41if [ "$CI_BUILD_TYPE" = "wayland" ]; then
44 ./autogen.sh $WAYLAND_COPTS 42 ./autogen.sh $WAYLAND_COPTS
45 make -j $PARALLEL_JOBS 43 make
46 make -j $PARALLEL_JOBS examples 44 make examples
47fi 45fi
48 46
49if [ "$CI_BUILD_TYPE" = "misc" ]; then 47if [ "$CI_BUILD_TYPE" = "misc" ]; then
50 ./autogen.sh $MISC_COPTS 48 ./autogen.sh $MISC_COPTS
51 make -j $PARALLEL_JOBS 49 make
52 make -j $PARALLEL_JOBS examples 50 make examples
53fi 51fi
54 52
55if [ "$CI_BUILD_TYPE" = "misc-disabled" ]; then 53if [ "$CI_BUILD_TYPE" = "misc-disabled" ]; then
56 ./autogen.sh $MISC_DISABLED_COPTS 54 ./autogen.sh $MISC_DISABLED_COPTS
57 make -j $PARALLEL_JOBS 55 make
58 make -j $PARALLEL_JOBS examples 56 make examples
59fi 57fi
60 58
61if [ "$CI_BUILD_TYPE" = "release-ready" ]; then 59if [ "$CI_BUILD_TYPE" = "release-ready" ]; then
62 ./autogen.sh $RELEASE_READY_COPTS 60 ./autogen.sh $RELEASE_READY_COPTS
63 make -j $PARALLEL_JOBS 61 make
64 make -j $PARALLEL_JOBS distcheck 62 make distcheck
65fi 63fi
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 @@
3set -e 3set -e
4 4
5COPTS="--disable-cxx-bindings" 5COPTS="--disable-cxx-bindings"
6PARALLEL_JOBS=10
7 6
8# Prepare OSX env for build 7# Prepare OSX env for build
9mkdir -p ~/Library/LaunchAgents 8mkdir -p ~/Library/LaunchAgents
@@ -16,6 +15,6 @@ export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
16 15
17# Normal build test of all targets 16# Normal build test of all targets
18./autogen.sh $COPTS $@ 17./autogen.sh $COPTS $@
19make -j $PARALLEL_JOBS 18make
20make -j $PARALLEL_JOBS examples 19make examples
21#make -j $PARALLEL_JOBS benchmark 20#make benchmark