Skip to content

Commit

Permalink
VENOM-488: Improve travis ci
Browse files Browse the repository at this point in the history
* Move docker container build steps in to .travis.yml
* Remove now obsolete Dockerfile
* Create build matrix for ubuntu 18.04, 18.10 and debian buster
  • Loading branch information
naxuroqa committed Jan 22, 2019
1 parent 96416ad commit b68b547
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 52 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Expand Up @@ -5,8 +5,8 @@ commands:
steps:
- run:
name: Install dependencies
command: apt update
&& apt install -y
command: apt-get -qq update
&& apt-get -qq install -y
clang
cmake
libconfig-dev
Expand Down Expand Up @@ -64,8 +64,8 @@ commands:
- run:
name: Bootstrap vala
command: |
apt remove -y valac
apt install -y flex bison
apt-get -qq remove -y valac
apt-get -qq install -y flex bison
wget https://download.gnome.org/sources/vala/0.43/vala-0.43.6.tar.xz
tar -xJf vala-0.43.6.tar.xz
cd vala-0.43.6
Expand Down
50 changes: 44 additions & 6 deletions .travis.yml
@@ -1,15 +1,53 @@
sudo: required
language: generic
services: [docker]

matrix:
include:
- name: "Ubuntu 18.04"
env: DOCKER_IMAGE=ubuntu:18.04
- name: "Ubuntu 18.10"
env: DOCKER_IMAGE=ubuntu:18.10
- name: "Debian 10"
env: DOCKER_IMAGE=debian:buster

install:
- docker build --tag test-image .
- docker run --detach --interactive --name test-image-container --volume "$(pwd)":/tmp/venom --workdir /tmp/venom test-image
- docker run --name image -it -d --volume "$(pwd)":/tmp/venom --workdir /tmp/venom $DOCKER_IMAGE
- docker exec image apt-get -qq update
- docker exec image apt-get -qq install -y
clang
cmake
libconfig-dev
libgtest-dev
libopus-dev
libsodium-dev
libvpx-dev
pkg-config
libgee-0.8-dev
libgspell-1-dev
libgtk-3-dev
libjson-glib-dev
libsoup2.4-dev
libsqlcipher-dev
libcanberra-dev
libgstreamer1.0-dev
libgstreamer-plugins-base1.0-dev
valac
python3-pip
wget
> /dev/null
- docker exec image pip3 install meson ninja
- docker exec image bash -c "wget 'https://github.com/TokTok/c-toxcore/archive/v0.2.9.tar.gz'
&& tar -xzf v0.2.9.tar.gz
&& cd c-toxcore-0.2.9
&& cmake -DCMAKE_INSTALL_PREFIX=/usr
&& make
&& make install"

script:
- docker exec test-image-container meson -D b_coverage=true build
- docker exec test-image-container ninja -C build
- docker exec test-image-container ninja -C build test
- docker exec image meson -D b_coverage=true build
- docker exec image ninja -C build
- docker exec image ninja -C build test
- docker exec image ninja -C build install

after_success:
- bash <(curl -s https://codecov.io/bash)
42 changes: 0 additions & 42 deletions Dockerfile

This file was deleted.

0 comments on commit b68b547

Please sign in to comment.