From 781e68aefc5230905ba857f51dee8e3dfc7c1568 Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Fri, 23 Jun 2017 11:42:20 +0200 Subject: [PATCH] .travis.yml: Move EMPTY_THEME_WHILE_LOADING=1 to another build The combination of TEST_PREV_COMMITS=1 and EMPTY_THEME_WHILE_LOADING=1 does not work. When trying to test the previous commits, the following error happens: error: Your local changes to the following files would be overwritten by checkout: lib/beautiful/init.lua This local modification was done by EMPTY_THEME_WHILE_LOADING=1. Signed-off-by: Uli Schlachter --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b508db119..91a80c9e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,11 +14,11 @@ env: # Lua 5.3 isn't available in Ubuntu Trusty, so some magic below installs it. - LUA=5.3 LUANAME=lua5.3 LUALIBRARY=/usr/lib/liblua.so DO_COVERAGE=codecov # 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 EMPTY_THEME_WHILE_LOADING=1 + - 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.2 with older lgi and screen size not divisible by 2. - - LUA=5.2 LUANAME=lua5.2 LGIVER=0.8.0 TESTS_SCREEN_SIZE=1921x1079 BUILD_APIDOC=true DO_CHECKQA=1 + - 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 global: # Secure GH_APIDOC_TOKEN to push to awesomeWM/apidoc. - secure: "R/HYDclnws1I1+v9Yjt+RKa4CsFhbBT9tiwE3EfPhEj2KCYX4sFRMxuZvLf5sq0XWdrQaPhQ54fgAZGr3f054JKRXcTB0g9J6nhSHz9kIjPh446gafUhEeDQcZRwM/MeCWiwFIkiZm6smYoDFE9JTWu6quNV+lQ4kcVDOp2ibEc="