Updated Linux CI image to cosmic.

4 files changed, 20 insertions, 18 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
   - |
diff --git a/ciimage/Dockerfile b/ciimage/Dockerfile
index ac59ca9..520ce0f 100644
--- a/ciimage/Dockerfile
+++ b/ciimage/Dockerfile
@@ -1,27 +1,28 @@
-FROM ubuntu:bionic
+FROM ubuntu:cosmic
 
 ENV DEBIAN_FRONTEND noninteractive
+ENV LANG='C.UTF-8'
+ENV DC=gdc
 
-RUN apt-get -y update && apt-get -y upgrade \
-&& apt-get -y install wget unzip \
+RUN sed -i '/^#\sdeb-src /s/^#//' "/etc/apt/sources.list" \
+&& apt-get -y update && apt-get -y upgrade \
 && apt-get -y build-dep meson \
-&& apt-get -y install qt5-default qtbase5-private-dev clang \
-&& apt-get -y install pkg-config-arm-linux-gnueabihf \
-&& apt-get -y install doxygen \
 && apt-get -y install python3-pip libxml2-dev libxslt1-dev cmake libyaml-dev \
+&& python3 -m pip install hotdoc codecov \
+&& apt-get -y install wget unzip \
+&& apt-get -y install qt5-default clang \
+&& apt-get -y install pkg-config-arm-linux-gnueabihf \
 && apt-get -y install qt4-linguist-tools \
 && apt-get -y install python-dev \
-&& apt-get -y install libomp-dev openssh-client \
-&& apt-get -y install clang libclang-dev llvm-dev flex \
+&& apt-get -y install libomp-dev \
+&& apt-get -y install dub ldc \
+&& apt-get -y install mingw-w64 mingw-w64-tools nim \
+&& apt-get -y install --no-install-recommends wine-stable \
+&& apt-get -y install llvm-dev libclang-dev \
 && apt-get -y install libgcrypt11-dev \
-&& apt-get -y install gdc ldc \
-&& python3 -m pip install hotdoc codecov \
-&& dub fetch urld \
-&& dub build urld --compiler=gdc \
+&& dub fetch urld && dub build urld --compiler=gdc \
 && dub fetch dubtestproject \
 && dub build dubtestproject:test1 --compiler=ldc2 \
 && dub build dubtestproject:test2 --compiler=ldc2
-
 # OpenSSH client is needed to run openmpi binaries.
 
-ENV LANG='C.UTF-8'
diff --git a/test cases/frameworks/17 mpi/is_broken_ubuntu.py b/test cases/frameworks/17 mpi/is_broken_ubuntu.py
index d0c0d0d..27651ba 100755
--- a/test cases/frameworks/17 mpi/is_broken_ubuntu.py
+++ b/test cases/frameworks/17 mpi/is_broken_ubuntu.py
@@ -5,5 +5,5 @@
 import sys
 
 fc = open('/etc/apt/sources.list').read()
-if 'artful' not in fc and 'bionic' not in fc:
+if 'artful' not in fc and 'bionic' not in fc and 'cosmic' not in fc:
     sys.exit(1)
diff --git a/test cases/frameworks/23 hotdoc/installed_files.txt b/test cases/frameworks/23 hotdoc/installed_files.txt
index 6804dbf..296dcf6 100644
--- a/test cases/frameworks/23 hotdoc/installed_files.txt
+++ b/test cases/frameworks/23 hotdoc/installed_files.txt
@@ -2,7 +2,8 @@ usr/share/doc/foobar/html/foo.html
 usr/share/doc/foobar/html/c-index.html
 usr/share/doc/foobar/html/index.html
 usr/share/doc/foobar/html/dumped.trie
-usr/share/doc/foobar/html/assets/css/prism.css
+usr/share/doc/foobar/html/assets/theme.json
+usr/share/doc/foobar/html/assets/css/prism-tomorrow.css
 usr/share/doc/foobar/html/assets/css/bootstrap-toc.min.css
 usr/share/doc/foobar/html/assets/css/frontend.css
 usr/share/doc/foobar/html/assets/css/dumped.trie