diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-29 22:36:28 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-05-02 22:02:33 +0300 |
| commit | 77b72e8573bbd8d6d04cb11aacdba604b8649f4d (patch) | |
| tree | 512b63c6ec5ee9a98e21da9dac4ff3daf7450271 /.travis.yml | |
| parent | badbfa125ca1ceb1d159d0a336c161bf0a8a3b6f (diff) | |
| download | meson-77b72e8573bbd8d6d04cb11aacdba604b8649f4d.zip meson-77b72e8573bbd8d6d04cb11aacdba604b8649f4d.tar.gz meson-77b72e8573bbd8d6d04cb11aacdba604b8649f4d.tar.bz2 | |
Update CI image to bionic.
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 16fa55b..77deae8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,13 +37,13 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python@2 python@3 mercurial qt; 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:artful; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:bionic; 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:artful > Dockerfile; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM jpakkane/mesonci:bionic > Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit .; fi - | |