Update Linux CI image to Ubuntu Eoan. [skip ci]

pull/6083/head
Jussi Pakkanen 5 years ago committed by GitHub
parent 603b1ac287
commit 5eb3875175
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .travis.yml
  2. 50
      ciimage/Dockerfile

@ -44,13 +44,13 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt llvm ninja; fi
# # Run one macOS build without pkg-config available, and the other (unity=on) with pkg-config
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$MESON_ARGS" =~ .*unity=on.* ]]; then brew install pkg-config; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:cosmic; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:eoan; 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:cosmic > Dockerfile; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo FROM jpakkane/mesonci:eoan > Dockerfile; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo ADD . /root >> Dockerfile; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build -t withgit .; fi
- |

@ -1,4 +1,4 @@
FROM ubuntu:cosmic
FROM ubuntu:eoan
ENV DEBIAN_FRONTEND noninteractive
ENV LANG='C.UTF-8'
@ -6,28 +6,30 @@ ENV DC=gdc
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 python3-pytest-xdist \
&& 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 \
&& 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 libgpgme-dev \
&& apt-get -y install libhdf5-dev \
&& apt-get -y install libboost-python-dev \
&& apt-get -y install libblocksruntime-dev \
&& dub fetch urld && dub build urld --compiler=gdc \
&& dub fetch dubtestproject \
&& dub build dubtestproject:test1 --compiler=ldc2 \
&& dub build dubtestproject:test2 --compiler=ldc2
&& apt-get -y install eatmydata \
&& eatmydata apt-get -y build-dep meson \
&& eatmydata apt-get -y install python3-pytest-xdist \
&& eatmydata apt-get -y install python3-pip libxml2-dev libxslt1-dev libyaml-dev libjson-glib-dev \
&& eatmydata python3 -m pip install hotdoc codecov \
&& eatmydata apt-get -y install wget unzip \
&& eatmydata apt-get -y install qt5-default clang \
&& eatmydata apt-get -y install pkg-config-arm-linux-gnueabihf \
&& eatmydata apt-get -y install qt4-linguist-tools \
&& eatmydata apt-get -y install python-dev \
&& eatmydata apt-get -y install libomp-dev \
&& eatmydata apt-get -y install dub ldc \
&& eatmydata apt-get -y install mingw-w64 mingw-w64-tools nim \
&& eatmydata apt-get -y install --no-install-recommends wine-stable \
&& eatmydata apt-get -y install libclang-dev \
&& eatmydata apt-get -y install libgcrypt20-dev \
&& eatmydata apt-get -y install libgpgme-dev \
&& eatmydata apt-get -y install libhdf5-dev \
&& eatmydata apt-get -y install libboost-python-dev \
&& eatmydata apt-get -y install libblocksruntime-dev \
&& eatmydata apt-get -y install libperl-dev \
&& eatmydata dub fetch urld && dub build urld --compiler=gdc \
&& eatmydata dub fetch dubtestproject \
&& eatmydata dub build dubtestproject:test1 --compiler=ldc2 \
&& eatmydata dub build dubtestproject:test2 --compiler=ldc2
# OpenSSH client is needed to run openmpi binaries.

Loading…
Cancel
Save