From: nhmall <nhmall@nethack.org>
Date: Mon, 28 Oct 2019 00:24:34 +0000 (-0400)
Subject: more travis testing for windows
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7229effd8262242e25a66b4dbd9f3cfc43450b0;p=nethack

more travis testing for windows
---

diff --git a/.travis.yml b/.travis.yml
index 5107de18b..09d5ac75b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,6 @@
 language: c
 matrix:
   include:
-    - os: windows
-      env: DESCR=windows-visualstudio
-      language: shell
-      script:
-        - ./win/win32/vs2017/travisci.sh
-    - os: windows
-#     install: choco install mingw
-      env: DESCR=windows-mingw
-      script:
-        - git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses
-        - export ADD_CURSES=Y
-        - export PDCURSES_TOP=../../pdcurses
-        - cd src
-        - cp ../sys/winnt/Makefile.gcc ./Makefile
-        - mingw32-make install
-  exclude:
     - os: linux
       env: DESCR=linux-xenial-gcc HINTS=linux
       compiler: gcc
@@ -85,6 +69,22 @@ matrix:
               sed -i 's/^#define TEXTCOLOR//'     include/unixconf.h
               make install
               cat dat/options
+    - os: windows
+      env: DESCR=windows-visualstudio
+      language: shell
+      script:
+        - ./win/win32/vs2017/travisci.sh
+    - os: windows
+#     install: choco install mingw
+      env: DESCR=windows-mingw
+      script:
+        - git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses
+        - export ADD_CURSES=Y
+        - export PDCURSES_TOP=../../pdcurses
+        - cd src
+        - cp ../sys/winnt/Makefile.gcc ./Makefile
+        - mingw32-make install
+  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