dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Mike Blumenkrantz 2018-07-12 09:17:35 -04:00
parent f21fd7e2fd
commit d279918174
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.ci/ci-linux-build.sh
View File

@ -2,8 +2,6 @@
set -e set -e
PARALLEL_JOBS=10
CI_BUILD_TYPE=$1 CI_BUILD_TYPE=$1
DEFAULT_COPTS="--prefix=/usr/ --with-tests=regular --disable-cxx-bindings" 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 if [ "$CI_BUILD_TYPE" = "" ]; then
# Normal build test of all targets # Normal build test of all targets
./autogen.sh $DEFAULT_COPTS ./autogen.sh $DEFAULT_COPTS
make -j $PARALLEL_JOBS make
make -j $PARALLEL_JOBS check-build make check-build
make -j $PARALLEL_JOBS examples make examples
make -j $PARALLEL_JOBS benchmark make benchmark
make -j $PARALLEL_JOBS install make install
./.ci/build-efl-app.sh ./.ci/build-efl-app.sh
fi fi
if [ "$CI_BUILD_TYPE" = "wayland" ]; then if [ "$CI_BUILD_TYPE" = "wayland" ]; then
./autogen.sh $WAYLAND_COPTS ./autogen.sh $WAYLAND_COPTS
make -j $PARALLEL_JOBS make
make -j $PARALLEL_JOBS examples make examples
fi fi
if [ "$CI_BUILD_TYPE" = "misc" ]; then if [ "$CI_BUILD_TYPE" = "misc" ]; then
./autogen.sh $MISC_COPTS ./autogen.sh $MISC_COPTS
make -j $PARALLEL_JOBS make
make -j $PARALLEL_JOBS examples make examples
fi fi
if [ "$CI_BUILD_TYPE" = "misc-disabled" ]; then if [ "$CI_BUILD_TYPE" = "misc-disabled" ]; then
./autogen.sh $MISC_DISABLED_COPTS ./autogen.sh $MISC_DISABLED_COPTS
make -j $PARALLEL_JOBS make
make -j $PARALLEL_JOBS examples make examples
fi fi
if [ "$CI_BUILD_TYPE" = "release-ready" ]; then if [ "$CI_BUILD_TYPE" = "release-ready" ]; then
./autogen.sh $RELEASE_READY_COPTS ./autogen.sh $RELEASE_READY_COPTS
make -j $PARALLEL_JOBS make
make -j $PARALLEL_JOBS distcheck make distcheck
fi fi

7
.ci/ci-osx-build.sh
View File

@ -3,7 +3,6 @@
set -e set -e
COPTS="--disable-cxx-bindings" COPTS="--disable-cxx-bindings"
PARALLEL_JOBS=10
# Prepare OSX env for build # Prepare OSX env for build
mkdir -p ~/Library/LaunchAgents mkdir -p ~/Library/LaunchAgents
@ -16,6 +15,6 @@ export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS"
# Normal build test of all targets # Normal build test of all targets
./autogen.sh $COPTS $@ ./autogen.sh $COPTS $@
make -j $PARALLEL_JOBS make
make -j $PARALLEL_JOBS examples make examples
#make -j $PARALLEL_JOBS benchmark #make benchmark

19
.travis.yml
View File

@ -8,14 +8,17 @@ os:
- osx - osx
env: env:
- global:
- DISTRO=Ubuntu1804 - MAKEFLAGS="-j5"
- DISTRO=Fedora28 CI_BUILD_TYPE=wayland matrix:
- DISTRO=Fedora28 CI_BUILD_TYPE=misc -
- DISTRO=Fedora28 CI_BUILD_TYPE=misc-disabled - DISTRO=Ubuntu1804
- DISTRO=Fedora28 CI_BUILD_TYPE=release-ready - DISTRO=Fedora28 CI_BUILD_TYPE=wayland
- DISTRO=Debian91 - DISTRO=Fedora28 CI_BUILD_TYPE=misc
- DISTRO=Archlinux - DISTRO=Fedora28 CI_BUILD_TYPE=misc-disabled
- DISTRO=Fedora28 CI_BUILD_TYPE=release-ready
- DISTRO=Debian91
- DISTRO=Archlinux
services: services:
- docker - docker