From: nhmall <nhmall@nethack.org>
Date: Wed, 27 Nov 2019 00:26:49 +0000 (-0500)
Subject: prepare branch for travis-ci
X-Git-Tag: NetHack-3.7.0_WIP~228^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=45290941385e4f28b06d8fb86ab9db5b88bef7fc;p=nethack

prepare branch for travis-ci
---

diff --git a/.travis.yml b/.travis.yml
index 5c7ef79b8..a8aa59d41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,11 @@ matrix:
     - os: linux
       env: DESCR=linux-xenial-gcc HINTS=linux
       compiler: gcc
-      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install"
+      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make fetch-lua && make install"
     - os: linux
       env: DESCR=linux-xenial-clang HINTS=linux
       compiler: clang
-      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install"
+      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make fetch-lua && make install"
     - os: linux
       env: DESCR=linux-xenial-gcc-x11 HINTS=linux-x11
       compiler: gcc
@@ -18,7 +18,7 @@ matrix:
             - libx11-dev
             - libxaw7-dev
             - xfonts-utils
-      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install"
+      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make fetch-lua && make install"
     - os: linux
       env: DESCR=linux-xenial-gcc-qt5 HINTS=linux-qt5
       compiler: gcc
@@ -31,7 +31,7 @@ matrix:
             - qtbase5-dev
             - qtmultimedia5-dev
             - qtbase5-dev-tools
-      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && QT_SELECT=5 make MOC=moc install"
+      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && QT_SELECT=5 && make fetch-lua && make MOC=moc install"
     - os: linux
       env: DESCR=linux-bionic-gcc-x11 HINTS=linux-x11
       dist: bionic
@@ -42,7 +42,7 @@ matrix:
             - libx11-dev
             - libxaw7-dev
             - xfonts-utils
-      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install"
+      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make fetch-lua && make install"
     - os: linux
       env: DESCR=linux-xenial-gcc-minimal HINTS=linux-minimal
       compiler: gcc
@@ -67,8 +67,18 @@ matrix:
               sed -i '/^#define SHELL/d'          include/unixconf.h
               sed -i '/^#define SUSPEND/d'        include/unixconf.h
               sed -i 's/^#define TEXTCOLOR//'     include/unixconf.h
-              make install
+              make fetch-lua && make install
               cat dat/options
+    - os: linux
+      env: DESCR=msdos-cross-on-linux HINTS=linux LUA_VERSION=5.3.5
+      compiler: gcc
+      script:
+#        - export
+        - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
+        - make fetch-lua
+        - cd lib/lua-$LUA_VERSION/src && make a && cd ../../.. 
+        - sh sys/msdos/msdos-cross-compile.sh
+  exclude:
     - os: windows
       env: DESCR=windows-visualstudio
       language: shell
@@ -84,16 +94,6 @@ matrix:
         - cd src
         - cp ../sys/winnt/Makefile.gcc ./Makefile
         - mingw32-make install
-    - os: linux
-      env: DESCR=msdos-cross-on-linux HINTS=linux LUA_VERSION=5.3.5
-      compiler: gcc
-      script:
-#        - export
-        - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make fetch-lua
-        - cd lib/lua-$LUA_VERSION/src && make a && cd ../../.. 
-        - sh sys/msdos/msdos-cross-compile.sh
-  exclude:
 #    - os: osx
 #      osx_image: xcode10.3
 #      env: DESCR=osx-xcode10.3-x11 HINTS=macosx10.14 WANT_WIN_CURSES=1 WANT_WIN_X11=1 USE_XPM=1