From: nhmall <nhmall@nethack.org>
Date: Sat, 15 Aug 2020 20:43:59 +0000 (-0400)
Subject: adjust travis-ci builds
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1879f2117684bbadddc38aa05899745007f1a791;p=nethack

adjust travis-ci builds

add builds that tests tty, curses, X11, and Qt5 on
all of the following:
linux-xenial, linux-bionic, linux-focal

Also still tests "nocommon" on earlier gcc versions.
Add a focal with gcc9 build to test that compiler version.

Here are the test builds:
linux-xenial-gcc-win-all
linux-bionic-gcc-win-all
linux-focal-clang-win-all
linux-xenial-gcc-nocommon
linux-focal-gcc9-win-all
linux-xenial-gcc-minimal
windows-visualstudio
windows-mingw
msdos-linux-focal-djgpp-crosscompile
---

diff --git a/.travis.yml b/.travis.yml
index f72095eff..a2e589a65 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,93 +1,95 @@
 language: c
+matrix:
 matrix:
   include:
-    - name: linux-xenial-gcc
+    - name: linux-xenial-gcc-win-all
       os: linux
-      env: HINTS=linux LUA_VERSION=5.4.0
-      compiler: gcc
-      script:
-        - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make fetch-lua
-        - test -d "lib/lua-$LUA_VERSION/src" || exit 0
-        - make install
-    - name: linux-xenial-gcc-nocommon
-      os: linux
-      env: HINTS=linux LUA_VERSION=5.4.0
+      env: HINTS=linux.2020 LUA_VERSION=5.4.0
       compiler: gcc
+      addons:
+        apt:
+          packages:
+            - libx11-dev
+            - libxaw7-dev
+            - xfonts-utils
+            - qtbase5-dev
+            - qtmultimedia5-dev
+            - qtbase5-dev-tools
       script:
-        - echo "CFLAGS+=-fno-common" >>sys/unix/hints/$HINTS
         - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make fetch-lua
+        - make fetch-lua LUA_VERSION=$LUA_VERSION
         - test -d "lib/lua-$LUA_VERSION/src" || exit 0
-        - make install
-    - name: linux-bionic-gcc
+        - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
+    - name: linux-bionic-gcc-win-all
       os: linux
-      env: HINTS=linux LUA_VERSION=5.4.0
+      env: HINTS=linux.2020 LUA_VERSION=5.4.0
       dist: bionic
       compiler: gcc
-      script:
-        - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make fetch-lua
-        - test -d "lib/lua-$LUA_VERSION/src" || exit 0
-        - make install
-    - name: linux-xenial-clang
-      os: linux
-      env: HINTS=linux LUA_VERSION=5.4.0
-      compiler: clang
-      script:
-        - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make fetch-lua
-        - test -d "lib/lua-$LUA_VERSION/src" || exit 0
-        - make install
-    - name: linux-xenial-gcc-x11
-      os: linux
-      env: HINTS=linux-x11 LUA_VERSION=5.4.0
-      compiler: gcc
       addons:
         apt:
           packages:
             - libx11-dev
             - libxaw7-dev
             - xfonts-utils
+            - qtbase5-dev
+            - qtmultimedia5-dev
+            - qtbase5-dev-tools
       script:
         - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make fetch-lua
+        - make fetch-lua LUA_VERSION=$LUA_VERSION
         - test -d "lib/lua-$LUA_VERSION/src" || exit 0
-        - make install
-    - name: linux-xenial-gcc-qt5
+        - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
+    - name: linux-focal-clang-win-all
       os: linux
-      env: HINTS=linux-qt5 LUA_VERSION=5.4.0
-      compiler: gcc
+      env: HINTS=linux.2020 LUA_VERSION=5.4.0
+      dist: focal
+      compiler: clang
       addons:
         apt:
           packages:
+            - xfonts-utils
             - libx11-dev
             - libxaw7-dev
-            - xfonts-utils
             - qtbase5-dev
             - qtmultimedia5-dev
             - qtbase5-dev-tools
       script:
         - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make fetch-lua
+        - make fetch-lua LUA_VERSION=$LUA_VERSION
         - test -d "lib/lua-$LUA_VERSION/src" || exit 0
-        - make QT_SELECT=5 MOC=moc install
-    - name: linux-bionic-gcc-x11
+        - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
+    - name: linux-xenial-gcc-nocommon
       os: linux
-      env: HINTS=linux-x11 LUA_VERSION=5.4.0
-      dist: bionic
+      env: HINTS=linux.2020 LUA_VERSION=5.4.0
+      dist: xenial
+      compiler: gcc
+      script:
+        - echo "CFLAGS+=-fno-common" >>sys/unix/hints/$HINTS
+        - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
+        - make fetch-lua LUA_VERSION=$LUA_VERSION
+        - test -d "lib/lua-$LUA_VERSION/src" || exit 0
+        - make install
+    - name: linux-focal-gcc9-win-all
+      os: linux
+      env: HINTS=linux.2020 LUA_VERSION=5.4.0
+      dist: focal
       compiler: gcc
       addons:
         apt:
           packages:
+            - gcc-9
+            - g++-9
             - libx11-dev
             - libxaw7-dev
             - xfonts-utils
+            - qtbase5-dev
+            - qtmultimedia5-dev
+            - qtbase5-dev-tools
       script:
         - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make fetch-lua
+        - make fetch-lua LUA_VERSION=$LUA_VERSION
         - test -d "lib/lua-$LUA_VERSION/src" || exit 0
-        - make install
+        - make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 QT_SELECT=5 MOC=moc install
     - name: linux-xenial-gcc-minimal
       os: linux
       env: HINTS=linux-minimal LUA_VERSION=5.4.0
@@ -113,9 +115,9 @@ 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 fetch-lua
+              make fetch-lua LUA_VERSION=$LUA_VERSION
               test -d "lib/lua-$LUA_VERSION/src" || exit 0
-              make install
+              make LUA_VERSION=$LUA_VERSION WANT_WIN_ALL=1 install
               cat dat/options
     - name: windows-visualstudio
       os: windows
@@ -134,7 +136,7 @@ matrix:
         - test -d "lib/pdcurses" || exit 0
         - cd src
         - cp ../sys/winnt/Makefile.gcc ./Makefile
-        - mingw32-make install
+        - mingw32-make LUA_VERSION=$LUA_VERSION install
     - name: msdos-linux-focal-djgpp-crosscompile
       os: linux
       env: HINTS=linux LUA_VERSION=5.4.0
@@ -147,7 +149,7 @@ matrix:
         - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
         - make fetch-lua
         - test -d "lib/lua-$LUA_VERSION/src" || exit 0
-        - cd lib/lua-$LUA_VERSION/src && make a && cd ../../.. 
+        - cd lib/lua-$LUA_VERSION/src && make CC='gcc' a  && cd ../../.. 
         - sh sys/msdos/msdos-cross-compile.sh
   exclude:
 #    - os: osx