From d9b78c36457071d9b2d585a0da753200a495bbf9 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Mon, 15 Jun 2020 08:39:09 +0200
Subject: Merge Meson build job with another GCC10 instance

---
 .travis.yml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a1af3cc..6f3cec0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,6 +41,8 @@ matrix:
             - g++-10
             - python3
             - python3-pip
+            - meson
+            - ninja-build
           sources: *sources
       script:
         - make -j2
@@ -49,20 +51,9 @@ matrix:
         - cd ../
         - python3 -m pip install -r unittest/requirements.txt --user
         - cd unittest && python3 -m pytest -sv test_offline.py
-    - os: linux
-      dist: bionic
-      env: COMPILER_NAME=gcc CXX=g++-10 CC=gcc-10
-      addons:
-        apt:
-          packages:
-            - meson
-            - ninja-build
-            - libhidapi-dev
-            - g++-10
-          sources: *sources
-      script:
-        - mkdir build && meson build
-        - cd build && ninja
+        - cd ../
+        - mkdir -p build-meson && meson build-meson
+        - cd build-meson && ninja
         - env DESTDIR=install ninja install
     - os: linux
       dist: trusty
-- 
cgit v1.2.1