summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2018-01-02 16:47:12 +0100
committerStefan Schmidt <stefan@osg.samsung.com>2018-01-10 09:49:53 +0100
commitb31fa6493ff667b5e4e06eda88f6e4dcf992f216 (patch)
tree9730f40766e9acad6721392f1cbb6a266463f634 /.travis.yml
parentcf5c513ff94ff0a0f5e89018f3ffe57f6e47129c (diff)
travis: test docker build with prebuild image for speedup
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml26
1 files changed, 22 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 98f937f4cc..3cd3c7826a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,9 +8,6 @@ os: linux
8services: 8services:
9 - docker 9 - docker
10 10
11before_install:
12 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then .ci/ci-osx-deps.sh ; fi
13
14matrix: 11matrix:
15 include: 12 include:
16 - env: DISTRO=Ubuntu1710 13 - env: DISTRO=Ubuntu1710
@@ -25,6 +22,27 @@ matrix:
25# Xcode 7.3.1, OS X 10.11 22# Xcode 7.3.1, OS X 10.11
26# Xcode 8.3.3, OS X 10.12 23# Xcode 8.3.3, OS X 10.12
27 24
25before_install:
26 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then .ci/ci-osx-deps.sh ; fi
27
28before_script:
29 - |
30 if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then
31 docker pull stefanschmidt1/ci-support-files:$DISTRO
32 fi
33
28script: 34script:
29 - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then docker build -f .ci/Dockerfile-$DISTRO . ; fi 35 - |
36 if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then
37 docker run -v `pwd`:/src -w /src stefanschmidt1/ci-support-files:$DISTRO /src/.ci/ci-linux-build.sh
38 fi
30 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then .ci/ci-osx-build.sh ; fi 39 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then .ci/ci-osx-build.sh ; fi
40
41after_success:
42 - |
43 if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$DISTRO" != "" ]]; then
44 docker login -u stefanschmidt1 -p "$DOCKER_PASSWORD"
45 docker tag stefanschmidt1/ci-support-files:$DISTRO stefanschmidt1/ci-support-files:$DISTRO-$TRAVIS_BUILD_NUMBER
46 docker push stefanschmidt1/ci-support-files:$DISTRO
47 docker push stefanschmidt1/ci-support-files:$DISTRO-$TRAVIS_BUILD_NUMBER
48 fi