diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-26 21:14:17 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-26 14:16:04 -0700 |
| commit | 8105c6f027b18cab3f3abea74471cbb0febd54d5 (patch) | |
| tree | 8cb91c960af5fcd3a71b8960abd8b04db3903940 /.travis.yml | |
| parent | 2d058bdcff4c7da855826fc05bb8cdde7cff50c7 (diff) | |
| download | meson-8105c6f027b18cab3f3abea74471cbb0febd54d5.zip meson-8105c6f027b18cab3f3abea74471cbb0febd54d5.tar.gz meson-8105c6f027b18cab3f3abea74471cbb0febd54d5.tar.bz2 | |
Upgrade docker build image to yakkety.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index fdf82ef..cf3a5a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,13 +13,13 @@ services: before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install ninja python3; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:xenial; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:yakkety; fi # We need to copy the current checkout inside the Docker container, # because it has the MR id to be tested checked out. script: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM jpakkane/mesonci:xenial > Dockerfile; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM jpakkane/mesonci:yakkety > 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 run withgit /bin/sh -c "cd /root && TRAVIS=true ./run_tests.py"; fi |