From 897e5194743ee0159a428d034822bacb75233cd7 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 25 Apr 2018 11:51:55 +0100 Subject: ci: Use envvars to control the build options Instead of calling docker multiple times ourselves, use the `env` stanza to control the build options. --- .travis.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cfb469..d845310 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,11 @@ before_script: - echo ADD . /root >> Dockerfile - docker build -t withgit . +env: + - BUILD_OPTS="" + - BUILD_OPTS="-Dglx=no" + - BUILD_OPTS="-Degl=no" + - BUILD_OPTS="-Dx11=false" + script: - - docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh" - - docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh -Dglx=no" - - docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh -Degl=no" - - docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh -Dx11=false" + - docker run withgit /bin/sh -c "CC=$CC ./epoxy-run-tests.sh $BUILD_OPTS" -- cgit v1.2.1