From a35ba467df8dcd1b48fb3495c25fb290433b81c3 Mon Sep 17 00:00:00 2001 From: Peter Uithoven Date: Wed, 7 Nov 2018 01:39:59 +0100 Subject: [PATCH 1/2] Travis: use juno-unstable docker --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cde19daa8..a7bf6b18c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,8 @@ env: - DEPENDENCY_PACKAGES="meson libgranite-dev libgtk-3-dev libswitchboard-2.0-dev valac" install: - - docker pull elementary/docker:loki - - docker run -v "$PWD":/tmp/build-dir elementary/docker:loki /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && meson build --prefix=/usr && cd build && ninja" - - docker pull elementary/docker:loki-unstable - - docker run -v "$PWD":/tmp/build-dir elementary/docker:loki-unstable /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && rm -rf build && meson build --prefix=/usr && cd build && ninja" + - docker pull elementary/docker:juno-unstable + - docker run -v "$PWD":/tmp/build-dir elementary/docker:juno-unstable /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && rm -rf build && meson build --prefix=/usr && cd build && ninja" script: - echo BUILDS PASSED From b2800307156ff818351ed1dddec7adbcc68ea660 Mon Sep 17 00:00:00 2001 From: Peter Uithoven Date: Wed, 7 Nov 2018 02:19:30 +0100 Subject: [PATCH 2/2] Remove build folder remove --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a7bf6b18c..15e3e473f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: install: - docker pull elementary/docker:juno-unstable - - docker run -v "$PWD":/tmp/build-dir elementary/docker:juno-unstable /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && rm -rf build && meson build --prefix=/usr && cd build && ninja" + - docker run -v "$PWD":/tmp/build-dir elementary/docker:juno-unstable /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && meson build --prefix=/usr && cd build && ninja" script: - echo BUILDS PASSED