Update CI image to bionic.
This commit is contained in:
parent
badbfa125c
commit
77b72e8573
|
@ -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
|
||||
- |
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
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 \
|
||||
&& apt-get -y install libomp-dev openssh-client \
|
||||
&& python3 -m pip install hotdoc codecov
|
||||
|
||||
# OpenSSH client is needed to run openmpi binaries.
|
||||
|
||||
ENV LANG='C.UTF-8'
|
||||
|
|
|
@ -5,5 +5,5 @@
|
|||
import sys
|
||||
|
||||
fc = open('/etc/apt/sources.list').read()
|
||||
if 'artful' not in fc:
|
||||
if 'artful' not in fc and 'bionic' not in fc:
|
||||
sys.exit(1)
|
|
@ -31,7 +31,7 @@ endif
|
|||
#
|
||||
# https://bugs.launchpad.net/ubuntu/+source/gcc-defaults/+bug/1727474
|
||||
|
||||
ubudetector = find_program('is_artful.py')
|
||||
ubudetector = find_program('is_broken_ubuntu.py')
|
||||
uburesult = run_command(ubudetector)
|
||||
|
||||
if uburesult.returncode() != 0 and add_languages('fortran', required : false)
|
||||
|
|
Loading…
Reference in New Issue