summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2017-05-13 17:32:17 +0100
committerEmmanuele Bassi <ebassi@gnome.org>2018-02-23 10:56:36 +0000
commitd1cce9914fcd920b5f27eeda68cdfad31586a6f7 (patch)
tree866684c3d0b395eefc662d76b498570dbe608d7a
parent64fc3ac7ce15bd18ecd75bb02f87b59ecb701816 (diff)
downloadlibepoxy-d1cce9914fcd920b5f27eeda68cdfad31586a6f7.tar.gz
travis: Drop conditional on Linux
We currently run CI on Linux only, given that the macOS builders in Travis are always fairly overwhelmed; thus, there's no need to complicate the Travis script with a conditional that is always going to be true.
-rw-r--r--.travis.yml14
1 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index dfeb2f5..01e47b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,14 +19,14 @@ services:
- docker
before_install:
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull ebassi/epoxyci ; fi
+ - docker pull ebassi/epoxyci
before_script:
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM ebassi/epoxyci > Dockerfile ; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi
+ - echo FROM ebassi/epoxyci > Dockerfile
+ - echo ADD . /root >> Dockerfile
+ - docker build -t withgit .
script:
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && CC=$CC ./epoxy-run-tests.sh" ; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && CC=$CC ./epoxy-run-tests.sh -Denable-glx=no" ; fi
- - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run withgit /bin/sh -c "cd /root && CC=$CC ./epoxy-run-tests.sh -Denable-egl=no" ; fi
+ - docker run withgit /bin/sh -c "cd /root && CC=$CC ./epoxy-run-tests.sh"
+ - docker run withgit /bin/sh -c "cd /root && CC=$CC ./epoxy-run-tests.sh -Denable-glx=no"
+ - docker run withgit /bin/sh -c "cd /root && CC=$CC ./epoxy-run-tests.sh -Denable-egl=no"