.travis.yml: Install libxcb-errors in one of the builds

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2019-02-18 08:23:52 +01:00
parent a57c79687a
commit be0b565c6e
1 changed files with 13 additions and 1 deletions

View File

@ -64,13 +64,15 @@ jobs:
- *BASE_PACKAGES - *BASE_PACKAGES
- liblua5.3-dev - liblua5.3-dev
- lua5.3 - lua5.3
- env: LUA=5.1 LUANAME=lua5.1 BUILD_IN_DIR=/tmp/awesome-build - env: LUA=5.1 LUANAME=lua5.1 BUILD_IN_DIR=/tmp/awesome-build WITH_XCB_ERRORS=yes
addons: addons:
apt: apt:
packages: packages:
- *BASE_PACKAGES - *BASE_PACKAGES
- liblua5.1-dev - liblua5.1-dev
- lua5.1 - lua5.1
# For xcb-errors
- xcb-proto
- env: LUA=5.1 LUANAME=luajit-2.0 LUALIBRARY=/usr/lib/x86_64-linux-gnu/libluajit-5.1.so LUAROCKS_ARGS=--lua-suffix=jit-2.0.4 - env: LUA=5.1 LUANAME=luajit-2.0 LUALIBRARY=/usr/lib/x86_64-linux-gnu/libluajit-5.1.so LUAROCKS_ARGS=--lua-suffix=jit-2.0.4
addons: addons:
apt: apt:
@ -110,6 +112,16 @@ install:
./autogen.sh --prefix=/usr ./autogen.sh --prefix=/usr
make && sudo make install) 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). # Install Lua (per env).
if [[ "$LUANAME" == "luajit-2.0" ]]; then if [[ "$LUANAME" == "luajit-2.0" ]]; then