From cf98da54750291a182a336bd4f71541789bd59d6 Mon Sep 17 00:00:00 2001 From: timvisee Date: Mon, 17 Feb 2020 13:12:28 +0100 Subject: [PATCH 1/2] Fix Travis CI build, add XCB build requirements, used in x11-clipboard --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9258499..7108415 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,10 @@ os: # TODO: figure out how to get headless X11 working script: | #!/bin/bash + if [[ $TRAVIS_OS_NAME == 'linux' ]]; then + apt-get update + apt-get install -y --no-install-recommends xorg-dev python3 libx11-xcb-dev libgl1-mesa-dev + fi cargo build --verbose if [[ $TRAVIS_OS_NAME == 'linux' ]]; then cargo build --tests --verbose From 6de232cfd686e118f41c5a59543a6b34be6c6eb7 Mon Sep 17 00:00:00 2001 From: timvisee Date: Mon, 17 Feb 2020 13:35:47 +0100 Subject: [PATCH 2/2] Use Travis CI addons feature for installing apt packages --- .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7108415..f1c38ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,18 @@ os: - linux - osx +addons: + apt: + update: true + packages: + - xorg-dev + - python3 + - libx11-xcb-dev + - libgl1-mesa-dev + # TODO: figure out how to get headless X11 working script: | #!/bin/bash - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then - apt-get update - apt-get install -y --no-install-recommends xorg-dev python3 libx11-xcb-dev libgl1-mesa-dev - fi cargo build --verbose if [[ $TRAVIS_OS_NAME == 'linux' ]]; then cargo build --tests --verbose