Skip to content
Snippets Groups Projects
Commit c129a244 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

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
parent 8237f32b
Branches
Tags
No related merge requests found
...@@ -11,9 +11,7 @@ env: ...@@ -11,9 +11,7 @@ env:
- OPENDHT_TEST_JOB="opendht.llvm" - OPENDHT_TEST_JOB="opendht.llvm"
- OPENDHT_TEST_JOB="opendht.proxyserver" - OPENDHT_TEST_JOB="opendht.proxyserver"
- OPENDHT_TEST_JOB="opendht.proxyclient" - OPENDHT_TEST_JOB="opendht.proxyclient"
- OPENDHT_TEST_JOB="opendht.proxyserverpush" - OPENDHT_TEST_JOB="opendht.push"
- OPENDHT_TEST_JOB="opendht.proxyclientpush"
- OPENDHT_TEST_JOB="opendht.all"
before_install: before_install:
- | - |
...@@ -40,17 +38,17 @@ script: ...@@ -40,17 +38,17 @@ script:
if [[ "$OPENDHT_TEST_JOB" != *"opendht.llvm"* ]] && [[ "$OPENDHT_TEST_JOB" != *"opendht.classic"* ]]; then if [[ "$OPENDHT_TEST_JOB" != *"opendht.llvm"* ]] && [[ "$OPENDHT_TEST_JOB" != *"opendht.classic"* ]]; then
docker build -t opendht-proxy -f docker/DockerfileTravisProxy .; docker build -t opendht-proxy -f docker/DockerfileTravisProxy .;
options=''; 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 '; options+='-DOPENDHT_PROXY_SERVER=ON ';
else else
options+='-DOPENDHT_PROXY_SERVER=OFF '; options+='-DOPENDHT_PROXY_SERVER=OFF ';
fi 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 '; options+='-DOPENDHT_PROXY_CLIENT=ON ';
else else
options+='-DOPENDHT_PROXY_CLIENT=OFF '; options+='-DOPENDHT_PROXY_CLIENT=OFF ';
fi 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 '; options+='-DOPENDHT_PUSH_NOTIFICATIONS=ON ';
else else
options+='-DOPENDHT_PUSH_NOTIFICATIONS=OFF '; options+='-DOPENDHT_PUSH_NOTIFICATIONS=OFF ';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment