summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-12-12 09:30:13 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-12-18 09:15:57 +0100
commit3234d65b1e587a357e651fb84d6e1bbd6963733f (patch)
tree3b259c34836c9c588569c2477fd1acfffa3ec4d7
parent9fb1ae0d3c1cd99ed8e81e4a54cae9216a72c7e0 (diff)
ci: travis: merge two if clauses
A left-over from the various works in this file. All of these commands are under the same conditions. Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com> Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D10864
-rw-r--r--.travis.yml3
1 files changed, 0 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 1b77b81bc2..15a5aeb93c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,9 +91,6 @@ before_script:
91 - | 91 - |
92 if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then 92 if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then
93 docker pull stefanschmidt1/ci-support-files:$DISTRO 93 docker pull stefanschmidt1/ci-support-files:$DISTRO
94 fi
95 - |
96 if [[ "$TRAVIS_OS_NAME" == "linux" ]] ; then
97 docker version 94 docker version
98 docker run --cidfile $HOME/cid -t -d -v `pwd`:/src -v $HOME/.ccache:/root/.ccache -w /src stefanschmidt1/ci-support-files:$DISTRO bash 95 docker run --cidfile $HOME/cid -t -d -v `pwd`:/src -v $HOME/.ccache:/root/.ccache -w /src stefanschmidt1/ci-support-files:$DISTRO bash
99 fi 96 fi