diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2018-04-29 22:36:28 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-05-01 21:14:17 +0300 |
| commit | 28f27354999de970fe6e2cf699312abdf25f3e3e (patch) | |
| tree | 2db419c8a7ee81446b068cea65caf52a724040c6 | |
| parent | b730ab6766e072ca4cc9cc44231a7cc17a7bc299 (diff) | |
| download | meson-bionic.tar.gz | |
Update CI image to bionic.bionic
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | ciimage/Dockerfile | 15 |
2 files changed, 8 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 16fa55b1e..77deae8b8 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 - | diff --git a/ciimage/Dockerfile b/ciimage/Dockerfile index 73f149563..a04345923 100644 --- a/ciimage/Dockerfile +++ b/ciimage/Dockerfile @@ -1,18 +1,15 @@ -FROM ubuntu:artful +FROM ubuntu:bionic + +ENV DEBIAN_FRONTEND noninteractive RUN apt-get -y update && apt-get -y upgrade \ -&& apt-get -y install git wget unzip \ +&& apt-get -y install wget unzip \ && 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 g++-7-arm-linux-gnueabihf \ +&& 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 \ -&& apt-get -y install libcups2-dev \ -&& apt-get -y install gcovr lcov \ -&& apt-get -y install fpga-icestorm arachne-pnr yosys \ -&& apt-get -y install gtk-sharp2 gtk-sharp2-gapi libglib2.0-cil-dev \ -&& apt-get -y install libwmf-dev \ -&& apt-get -y install qt4-linguist-tools qttools5-dev-tools \ +&& apt-get -y install qt4-linguist-tools \ && apt-get -y install python-dev \ && python3 -m pip install hotdoc codecov |