diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-11-11 01:02:38 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-12-09 16:23:19 +0200 |
| commit | f881532559196c9b831a3e0d13cf6470fe00f52e (patch) | |
| tree | 53c5f296d7e857791e2695af25ef188dfaf9f135 /.travis.yml | |
| parent | c6e022b560440fccbcfb75d529dc382b2ec017de (diff) | |
| download | meson-f881532559196c9b831a3e0d13cf6470fe00f52e.zip meson-f881532559196c9b831a3e0d13cf6470fe00f52e.tar.gz meson-f881532559196c9b831a3e0d13cf6470fe00f52e.tar.bz2 | |
Updated Linux CI image to cosmic.
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 bd8d48c..7658fa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,13 +46,13 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" && "$MESON_ARGS" =~ .*unity=on.* ]]; then brew install pkg-config; fi # Use a Ninja with QuLogic's patch: https://github.com/ninja-build/ninja/issues/1219 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir -p $HOME/tools; curl -L http://nirbheek.in/files/binaries/ninja/macos/ninja -o $HOME/tools/ninja; chmod +x $HOME/tools/ninja; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:bionic; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:cosmic; 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:bionic > Dockerfile; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM jpakkane/mesonci:cosmic > Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit .; fi - | |