From 2b5762cdb4d3b95e234ebdeec16f8d29f0dda71c Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Mon, 18 Feb 2019 08:23:52 +0100 Subject: [PATCH] .travis.yml: Install libxcb-errors in one of the builds Signed-off-by: Uli Schlachter --- .travis.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 70ae1559db7..379fe3e7886 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: # luajit: installed from source. - LUA=5.1 LUANAME=luajit-2.0 LUALIBRARY=/usr/lib/libluajit-5.1.so LUAROCKS_ARGS=--lua-suffix=jit-2.0.5 TEST_PREV_COMMITS=1 # Note: luarocks does not work with Lua 5.0. - - LUA=5.1 LUANAME=lua5.1 BUILD_IN_DIR=/tmp/awesome-build + - LUA=5.1 LUANAME=lua5.1 BUILD_IN_DIR=/tmp/awesome-build WITH_XCB_ERRORS=yes # Lua 5.2 with older lgi and screen size not divisible by 2. # SOURCE_DATE_EPOCH: used for stable dates during build. - LUA=5.2 LUANAME=lua5.2 LGIVER=0.8.0 TESTS_SCREEN_SIZE=1921x1079 BUILD_APIDOC=true DO_CHECKQA=1 EMPTY_THEME_WHILE_LOADING=1 SOURCE_DATE_EPOCH=1893456000 @@ -37,7 +37,7 @@ install: # Install build dependencies. # See also `apt-cache showsrc awesome | grep -E '^(Version|Build-Depends)'`. - - sudo apt-get install -y libnotify-bin libcairo2-dev gir1.2-gtk-3.0 libpango1.0-dev libxcb-xtest0-dev libxcb-icccm4-dev libxcb-randr0-dev libxcb-keysyms1-dev libxcb-xinerama0-dev libdbus-1-dev libxdg-basedir-dev libstartup-notification0-dev imagemagick libxcb1-dev libxcb-shape0-dev libxcb-util0-dev libx11-xcb-dev libxcb-cursor-dev libxcb-xkb-dev libxcb-xfixes0-dev libxkbcommon-dev libxkbcommon-x11-dev + - sudo apt-get install -y libnotify-bin libcairo2-dev gir1.2-gtk-3.0 libpango1.0-dev libxcb-xtest0-dev libxcb-icccm4-dev libxcb-randr0-dev libxcb-keysyms1-dev libxcb-xinerama0-dev libdbus-1-dev libxdg-basedir-dev libstartup-notification0-dev imagemagick libxcb1-dev libxcb-shape0-dev libxcb-util0-dev libx11-xcb-dev libxcb-cursor-dev libxcb-xkb-dev libxcb-xfixes0-dev libxkbcommon-dev libxkbcommon-x11-dev xcb-proto - sudo gem install asciidoctor # Deps for tests. @@ -52,6 +52,16 @@ install: ./autogen.sh --prefix=/usr make && sudo make install) + # Install xcb-errors if needed + - | + set -e + if [[ "$WITH_XCB_ERRORS" == "yes" ]]; then + git clone --depth 1 --recursive https://gitlab.freedesktop.org/xorg/lib/libxcb-errors.git /tmp/xcb-errors + (cd /tmp/xcb-errors + ./autogen.sh --prefix=/usr + make && sudo make install) + fi + # Install Lua (per env). - | set -e