should now be working

diff --git a/.travis.yml b/.travis.yml
index 1568ec754888464da9c3092abaaa5c39bd885db9..2da535eb7d1e93ffd5c7ff6a3eaea15f2a1bb0c8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,6 @@
 language: c
 matrix:
   include:
-    - os: windows
-      install: choco install winflexbison
-      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
@@ -86,6 +69,23 @@ matrix:
               sed -i 's/^#define TEXTCOLOR//'     include/unixconf.h
               make install
               cat dat/options
+    - os: windows
+      install: choco install winflexbison
+      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

diff --git a/win/win32/vs2017/travisci.sh b/win/win32/vs2017/travisci.sh
index b3bd3f739d4bc77f580754f4a12df5e28711519d..d74eb56fa8e86452930608fbfe2ec95adfb4a04c 100644 (file)
--- a/win/win32/vs2017/travisci.sh
+++ b/win/win32/vs2017/travisci.sh
@@ -39,7 +39,5 @@ mkdir ../binary
 cd src
 cp ../sys/winnt/Makefile.msc ./Makefile
 nmake install
-ls -l
-ls -l ../util
 cd ..
 powershell -Command "Compress-Archive -U -Path binary/* -DestinationPath $TRAVIS_TAG.x86.zip"