From 71f549ee79a0b86727a7f5b71e7791ac44b7fc05 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 5 Aug 2015 16:45:01 +0200 Subject: [PATCH] Travis: add lgi 0.7.0 to the build matrix This makes sure that the build and tests succeed with the minimal required version. --- .travis.yml | 7 ++++--- build-utils/lgi-check.sh | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 303140d43..1eb2546f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,9 @@ env: matrix: # Note: luarocks does not work with Lua 5.0. # - LUA=5.0 LUAPKG=50 LUALIB=/usr/lib/liblua50.so - - LUA=5.1 LUAPKG=5.1 LUALIB=/usr/lib/x86_64-linux-gnu/liblua5.1.so - - LUA=5.2 LUAPKG=5.2 LUALIB=/usr/lib/x86_64-linux-gnu/liblua5.2.so BUILD_APIDOC=true + - LUA=5.1 LGIVER= LUAPKG=5.1 LUALIB=/usr/lib/x86_64-linux-gnu/liblua5.1.so + - LUA=5.2 LGIVER= LUAPKG=5.2 LUALIB=/usr/lib/x86_64-linux-gnu/liblua5.2.so BUILD_APIDOC=true + - LUA=5.2 LGIVER=0.7.0 LUAPKG=5.2 LUALIB=/usr/lib/x86_64-linux-gnu/liblua5.2.so global: # Secure token to push to gh-pages. - secure: "LZxt9559+V3qJMdVgmKW4RYTt8ZINooex/qsnoEJUtZloj/eFNG4COT2z6a2yeH2tKWzknCsmV9nLPJiNEA2KLcyqDhjFQvJwKmsBuhGUmLyeQgfenjweorRjO8NT18X1SAEUXAMnClPu+OeTDs4BAuVn5foGZ7xpcRg2E+j2mc=" @@ -77,7 +78,7 @@ install: - cd .. - sudo apt-get install -qq libgirepository1.0-dev - - sudo luarocks install lgi + - sudo luarocks install lgi $LGIVER # Install busted for "make check". - sudo luarocks install busted diff --git a/build-utils/lgi-check.sh b/build-utils/lgi-check.sh index 96bab2901..d4545b16c 100755 --- a/build-utils/lgi-check.sh +++ b/build-utils/lgi-check.sh @@ -24,8 +24,8 @@ die() # Check if we have lgi lua -e 'require("lgi")' || die -# Check the version number -# Keep this in sync with lib/gears/surface.lua.in! +# Check the version number. +# Keep this in sync with lib/gears/surface.lua.in and .travis.yml (LGIVER)! lua -e 'if tonumber(string.match(require("lgi.version"), "(%d%.%d)")) < 0.7 then error("lgi too old, need at least version 0.7.0") end' || die # Check for the needed gi files