diff options
author | Mike Blumenkrantz <zmike@samsung.com> | 2018-07-12 09:17:35 -0400 |
---|---|---|
committer | Mike Blumenkrantz <zmike@samsung.com> | 2018-07-12 09:17:36 -0400 |
commit | d279918174947793b8f3d6880804eb60648c779f (patch) | |
tree | 7285ec9e46af6707ae89083180c67e0d1fc7edff /.ci | |
parent | f21fd7e2fd396bf62af22655f92e4c38ef62b0e7 (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.sh | 28 | ||||
-rwxr-xr-x | .ci/ci-osx-build.sh | 7 |
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 | ||
3 | set -e | 3 | set -e |
4 | 4 | ||
5 | PARALLEL_JOBS=10 | ||
6 | |||
7 | CI_BUILD_TYPE=$1 | 5 | CI_BUILD_TYPE=$1 |
8 | 6 | ||
9 | DEFAULT_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings" | 7 | DEFAULT_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings" |
@@ -32,34 +30,34 @@ RELEASE_READY_COPTS="--with-profile=release" | |||
32 | if [ "$CI_BUILD_TYPE" = "" ]; then | 30 | if [ "$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 |
41 | fi | 39 | fi |
42 | 40 | ||
43 | if [ "$CI_BUILD_TYPE" = "wayland" ]; then | 41 | if [ "$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 |
47 | fi | 45 | fi |
48 | 46 | ||
49 | if [ "$CI_BUILD_TYPE" = "misc" ]; then | 47 | if [ "$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 |
53 | fi | 51 | fi |
54 | 52 | ||
55 | if [ "$CI_BUILD_TYPE" = "misc-disabled" ]; then | 53 | if [ "$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 |
59 | fi | 57 | fi |
60 | 58 | ||
61 | if [ "$CI_BUILD_TYPE" = "release-ready" ]; then | 59 | if [ "$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 |
65 | fi | 63 | 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 @@ | |||
3 | set -e | 3 | set -e |
4 | 4 | ||
5 | COPTS="--disable-cxx-bindings" | 5 | COPTS="--disable-cxx-bindings" |
6 | PARALLEL_JOBS=10 | ||
7 | 6 | ||
8 | # Prepare OSX env for build | 7 | # Prepare OSX env for build |
9 | mkdir -p ~/Library/LaunchAgents | 8 | mkdir -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 $@ |
19 | make -j $PARALLEL_JOBS | 18 | make |
20 | make -j $PARALLEL_JOBS examples | 19 | make examples |
21 | #make -j $PARALLEL_JOBS benchmark | 20 | #make benchmark |