From 93727cf7b0cfe548c77da2843e52275e82025a72 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Tue, 22 May 2018 17:45:19 +0300 Subject: [PATCH 1/2] Enable ccache and mount it into the build/test container. --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc13586871..c7c0101748 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,8 @@ sudo: required services: - docker + +cache: ccache jobs: include: @@ -35,7 +37,7 @@ jobs: - MACHINE_ID=$(cat /var/lib/dbus/machine-id) before_script: *update script: - - docker run -dit --name travis_build ${DOCKER_REPOSITORY}:${TRAVIS_COMMIT} bash + - docker run -v $HOME/.ccache:$HOME/.ccache -dit --name travis_build ${DOCKER_REPOSITORY}:${TRAVIS_COMMIT} bash - docker exec -u 0 -ti travis_build bash -c "echo ${MACHINE_ID} > /etc/machine-id" - docker exec -ti travis_build meson build - docker exec -ti travis_build ninja -C build @@ -49,7 +51,7 @@ jobs: compiler: gcc before_script: *update script: - - docker run --privileged --net=host -dit --name travis_test ${DOCKER_REPOSITORY}:${TRAVIS_COMMIT} bash + - docker run -v $HOME/.ccache:$HOME/.ccache --privileged --net=host -dit --name travis_test ${DOCKER_REPOSITORY}:${TRAVIS_COMMIT} bash - docker exec -ti travis_test ninja -C build test - docker commit -m "systemd test state" -a "${AUTHOR_NAME}" travis_test ${DOCKER_REPOSITORY}:${TRAVIS_COMMIT} - docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}" From 94153a7fd995323a4a549703fab13775aeff0c13 Mon Sep 17 00:00:00 2001 From: Omer Katz Date: Tue, 22 May 2018 17:48:14 +0300 Subject: [PATCH 2/2] Install ccache in container. --- travis-ci/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/travis-ci/requirements.txt b/travis-ci/requirements.txt index f2dbae4b38..9a255f1e9d 100644 --- a/travis-ci/requirements.txt +++ b/travis-ci/requirements.txt @@ -1,3 +1,4 @@ dnf-plugins-core meson ninja-build +ccache