mgmc

.travis.yml

@@ -11,15 +11,8 @@ addons:
     - libsqlite3-dev
 before_install:
 - git submodule update --init --recursive
-
-- wget 'http://www.lua.org/ftp/lua-5.3.4.tar.gz'
-- tar zxf lua-5.3.4.tar.gz
-- cd lua-5.3.4
-- make linux test
-- sudo make install
-- cd ..
-
 - wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha12/premake-5.0.0-alpha12-linux.tar.gz | tar zfx -
+- wget -O - https://www.lua.org/ftp/lua-5.3.4.tar.gz | tar zfx -; cd lua-5.3.4; sudo make linux install; cd ..
 script:
 - ./premake5 gmake
 - cd build

appveyor.yml

@@ -60,8 +60,13 @@ deploy:
 cache:
   - premake-5.0.0-alpha12-windows.zip
   - libevent-2.0.22-stable.tar.gz
+<<<<<<< HEAD
   - freetype-2.8.1.tar.bz2
   - irrlicht-1.8.4.zip
   - lua-5.3.4.tar.gz
   - sqlite-amalgamation-3210000.zip
 
+=======
+  - lua-5.3.4.tar.gz
+  - sqlite-amalgamation-3200000.zip
+>>>>>>> e5df907f03618cd72942838237c5d8b50f841b53