From c4d4f83e1ef1769284235e2fd50964694756ba16 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Mon, 9 Apr 2018 15:33:44 -0400 Subject: [PATCH] Simplify the docker/travis stuff some Signed-off-by: Peter Jones --- .travis.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 563a9c0..72f9fd8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,13 +11,7 @@ matrix: services: docker before_install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull vathpela/efivar-travis-rawhide:v1 ; fi - -before_script: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM vathpela/efivar-travis-rawhide:v1 > Dockerfile ; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile ; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit . ; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull vathpela/efivar-travis-rawhide:v2 ; fi script: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run --volume $HOME/.ccache:/root/.ccache withgit /bin/sh -c "cd /root && git fetch && git reset --hard origin/master -- && ./travis-build.sh --branch $TRAVIS_BRANCH --repo \"$TRAVIS_REPO_SLUG\" --remote \"$TRAVIS_PULL_REQUEST_SLUG\" --pr-sha \"$TRAVIS_PULL_REQUEST_SHA\"" ; fi - - ccache -s + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker run vathpela/efivar-travis-rawhide:v2 /bin/sh -c "cd /root/efivar && git fetch && git reset --hard origin/master -- && ./travis-build.sh --branch $TRAVIS_BRANCH --repo \"$TRAVIS_REPO_SLUG\" --remote \"$TRAVIS_PULL_REQUEST_SLUG\" --pr-sha \"$TRAVIS_PULL_REQUEST_SHA\"" ; fi -- 2.11.0