From c129a24492f4c24a00f50c51afbaf65931ade4b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Sat, 17 Mar 2018 14:40:50 -0400 Subject: [PATCH] travis: use 5 build configurations Merge all push configurations to reduce build time as Travis provides 5 free simultaneous builds. The 'all' configuration is renamed 'push' to reflect the change --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3621f2be..62cea0a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,7 @@ env: - OPENDHT_TEST_JOB="opendht.llvm" - OPENDHT_TEST_JOB="opendht.proxyserver" - OPENDHT_TEST_JOB="opendht.proxyclient" - - OPENDHT_TEST_JOB="opendht.proxyserverpush" - - OPENDHT_TEST_JOB="opendht.proxyclientpush" - - OPENDHT_TEST_JOB="opendht.all" + - OPENDHT_TEST_JOB="opendht.push" before_install: - | @@ -40,17 +38,17 @@ script: if [[ "$OPENDHT_TEST_JOB" != *"opendht.llvm"* ]] && [[ "$OPENDHT_TEST_JOB" != *"opendht.classic"* ]]; then docker build -t opendht-proxy -f docker/DockerfileTravisProxy .; options=''; - if [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyserver"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyserverpush"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.all"* ]]; then + if [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyserver"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.push"* ]]; then options+='-DOPENDHT_PROXY_SERVER=ON '; else options+='-DOPENDHT_PROXY_SERVER=OFF '; fi - if [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyclient"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyclientpush"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.all"* ]]; then + if [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyclient"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.push"* ]]; then options+='-DOPENDHT_PROXY_CLIENT=ON '; else options+='-DOPENDHT_PROXY_CLIENT=OFF '; fi - if [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyserverpush"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.proxyclientpush"* ]] || [[ "$OPENDHT_TEST_JOB" == *"opendht.all"* ]]; then + if [[ "$OPENDHT_TEST_JOB" == *"opendht.push"* ]]; then options+='-DOPENDHT_PUSH_NOTIFICATIONS=ON '; else options+='-DOPENDHT_PUSH_NOTIFICATIONS=OFF '; -- GitLab