Update travis.yml file.

copperwater · Apr 13, 2020 · 8c2c970 · 8c2c970
1 parent 85804d4
commit 8c2c970
Show file tree

Hide file tree

Showing 2 changed files with 116 additions and 125 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,141 +1,131 @@
 language: c
 matrix:
   include:
-    - name: linux-xenial-gcc
-      os: linux
-      env: HINTS=linux
-      compiler: gcc
-      script:
-        - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make install
-    - name: linux-bionic-gcc
-      os: linux
-      env: HINTS=linux
-      dist: bionic
-      compiler: gcc
-      script:
-        - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make install
-    - name: linux-xenial-clang
-      os: linux
-      env: HINTS=linux
-      compiler: clang
-      script:
-        - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make install
-    - name: linux-xenial-gcc-x11
-      os: linux
-      env: HINTS=linux-x11
-      compiler: gcc
-      addons:
-        apt:
-          packages:
-            - libx11-dev
-            - libxaw7-dev
-            - xfonts-utils
-      script:
-        - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make install
-    - name: linux-xenial-gcc-qt5
-      os: linux
-      env: HINTS=linux-qt5
-      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 QT_SELECT=5 MOC=moc install
-    - name: linux-bionic-gcc-x11
-      os: linux
-      env: HINTS=linux-x11
-      dist: bionic
-      compiler: gcc
-      addons:
-        apt:
-          packages:
-            - libx11-dev
-            - libxaw7-dev
-            - xfonts-utils
-      script:
-        - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-        - make install
-    - name: linux-xenial-gcc-minimal
-      os: linux
-      env: HINTS=linux-minimal
-      compiler: gcc
-      script: |
-              cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
-              sed -i '/^#define CLIPPING/d'       include/config.h
-              sed -i '/^#define COMPRESS/d'       include/config.h
-              #sed -i '/^#define DOAGAIN/d'        include/config.h
-              sed -i '/^#define DUMPLOG/d'        include/config.h
-              #sed -i '/^#define GDBPATH/d'        include/config.h
-              #sed -i '/^#define GREPPATH/d'       include/config.h
-              sed -i '/^#define INSURANCE/d'      include/config.h
-              sed -i '/^#define LOGFILE/d'        include/config.h
-              sed -i '/^#define NEWS/d'           include/config.h
-              sed -i '/^#define PANICLOG/d'       include/config.h
-              #sed -i '/^#define STATUS_HILITES/d' include/config.h
-              sed -i '/^#define SYSCF/d'          include/config.h
-              sed -i '/^#define USER_SOUNDS/d'    include/config.h
-              sed -i '/^#define XLOGFILE/d'       include/config.h
-              sed -i '/^#define MAIL/d'           include/unixconf.h
-              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
-              cat dat/options
-    - name: windows-visualstudio
-      os: windows
-      language: shell
-      script:
-        - ./win/win32/vs2017/travisci.sh
-    - name: windows-mingw
-      os: windows
-#     install: choco install mingw
-      script:
-        - export ADD_CURSES=Y
-        - export PDCURSES_TOP=../lib/pdcurses
-        - sh sys/winnt/travis-gcc.sh
-        - test -d "lib/pdcurses" || exit 0
-        - cd src
-        - cp ../sys/winnt/Makefile.gcc ./Makefile
-        - mingw32-make install
+  - name: linux-xenial-gcc
+    os: linux
+    env: HINTS=linux
+    compiler: gcc
+    script:
+    - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
+    - make install
+  - name: linux-bionic-gcc
+    os: linux
+    env: HINTS=linux
+    dist: bionic
+    compiler: gcc
+    script:
+    - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
+    - make install
+  - name: linux-xenial-clang
+    os: linux
+    env: HINTS=linux
+    compiler: clang
+    script:
+    - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
+    - make install
+  - name: linux-xenial-gcc-x11
+    os: linux
+    env: HINTS=linux-x11
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+        - libx11-dev
+        - libxaw7-dev
+        - xfonts-utils
+    script:
+    - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
+    - make install
+  - name: linux-xenial-gcc-qt5
+    os: linux
+    env: HINTS=linux-qt5
+    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 QT_SELECT=5 MOC=moc install
+  - name: linux-bionic-gcc-x11
+    os: linux
+    env: HINTS=linux-x11
+    dist: bionic
+    compiler: gcc
+    addons:
+      apt:
+        packages:
+        - libx11-dev
+        - libxaw7-dev
+        - xfonts-utils
+    script:
+    - cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
+    - make install
+  - name: linux-xenial-gcc-minimal
+    os: linux
+    env: HINTS=linux-minimal
+    compiler: gcc
+    script: |
+      cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../
+      sed -i '/^#define CLIPPING/d'       include/config.h
+      sed -i '/^#define COMPRESS/d'       include/config.h
+      #sed -i '/^#define DOAGAIN/d'        include/config.h
+      sed -i '/^#define DUMPLOG/d'        include/config.h
+      #sed -i '/^#define GDBPATH/d'        include/config.h
+      #sed -i '/^#define GREPPATH/d'       include/config.h
+      sed -i '/^#define INSURANCE/d'      include/config.h
+      sed -i '/^#define LOGFILE/d'        include/config.h
+      sed -i '/^#define NEWS/d'           include/config.h
+      sed -i '/^#define PANICLOG/d'       include/config.h
+      #sed -i '/^#define STATUS_HILITES/d' include/config.h
+      sed -i '/^#define SYSCF/d'          include/config.h
+      sed -i '/^#define USER_SOUNDS/d'    include/config.h
+      sed -i '/^#define XLOGFILE/d'       include/config.h
+      sed -i '/^#define MAIL/d'           include/unixconf.h
+      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
+      cat dat/options
+  - name: windows-visualstudio
+    os: windows
+    language: shell
+    script:
+    - "./win/win32/vs2017/travisci.sh"
+  - name: windows-mingw
+    os: windows
+    script:
+    - export ADD_CURSES=Y
+    - export PDCURSES_TOP=../lib/pdcurses
+    - sh sys/winnt/travis-gcc.sh
+    - test -d "lib/pdcurses" || exit 0
+    - 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
-#      compiler: clang
-#      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install"
-    - os: osx
-      osx_image: xcode10.2
-      env: HINTS=macosx10.14
-      compiler: clang
-      script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install"
-#
+  - os: osx
+    osx_image: xcode10.2
+    env: HINTS=macosx10.14
+    compiler: clang
+    script: cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install
 sudo: false
 notifications:
   email:
     recipients:
-      - [email protected]
-#
+    - [email protected]
 deploy:
   provider: releases
   api_key:
-    secure: "U0Dt2CXrcG8Yi4taUCT/6AnM+0IJtdCv6IVG/2rGooUY3pZjNWE9XDM6X9ZeAmbI79aN6FPTppjUf3KbB/upYeJt+8mrjnxEk/ZTO1xXDDW8iL/DiqnczoFsMGmPsTM+Fkeak8bu0SifI7Qkx9i1N+zOyl2VdlaxGjchPfl/OJw2jcQs7rOGRfr23/rapZKTcFq+BFlxMiIHa0dXbCJ9vagdlyAeclOCtPjw1VoH/Cb/+0/Xlx2MFPncw4/1P+bO/fPantHyehh3/WCDVCnI4M7ftONpsTVRrQ+Hml89teUH9/1xXUOpbCeVghWr1rumLcQzMqLKNj2lP/gm9co2/DKpxiUPUzBfO/9Jvl1CNoEwPYQBRNb38kggDvAT4vKX38Oi5sZvumFEO4L0y7o4cW6SA4/CYIykfxOdkrryt8ltfWwopdy3I/DothYw31vJ9GsZOCAShFRAy3hJxYUbHhT+7SDUBadVSEkb4UqxQ+7zntAVT+Lp4DXLAfvsWxZGrQoP/IrWAgNOLRKILubpzh+YpadMH3Ygha2JRAeJAEZ3DnXf3vOOAucWnk4mNXDbW35GTDTAJDWMvddZCfsrUI/uHxgaRjFs9fLX1X5tqhGnsr27sKLWyX+zrIPVV0TPl3AzYPAf6Bc8Okeu+JEGQERvvgSasCuYcmhgYznBVJI="
-  file_glob: true
-  file: 
-    - "$TRAVIS_TAG.x86.zip"
+    secure: Jw7YZTwL2BYZ52FAxrkDfXOdZnPRVnLMNDWIKqR6BrZEECp4HZmkWJFvCl1rMivz27d/O15x37U5UgWGPLz8TUYTOt+6Da24jRLL2hQKA+DUjqDqrnnKztrtkntvBWJaffvTWjL4w0B3dmjeZv7klAgmQEKQW/A4B943vnYgsZl5H/dxlRH1QnGpTK0xQZkj4Z/bfsrCYjaPv9JCfbtbXhJtj5Cz+oW4e8KKAFhThqxcwmuIVAzC/K4hmh8LjtfUHTehCmIC7THSYi+uHlHyjnPb4aSaNop7FtC/XS/wLwnJGZE4zo66BCFkSFi5fNF5niLpW/JlweG0CA0eZyrqbdn1uM5msn5MOi4vvbRU5mIBci2w0/tmWfaZEm6EHa0b5xJ7zggzpqMw/tuuN9iE7sjC7KsXvB267kl3B4MmfcR4O0sz6tG6OAgd971FUMfKMDbjkQlLZZl06idM8OYN/vE9cFjnwXWylvHNxYcNWyrhhPiwFP+EzQnCXRZBAqZZL8Vq3Xr46ZzcBlY65T6w7B14IJ0OYXIbbvYjkwQkcRs7hh9CZ0H6JWfagq6ZVNOrrGfJeSXjK2Zy5KmfANBN8Za9dfFHAuq/wzcgeTm+exRUfQ+/UwVqPYwCW0v3IJopptktgXunf2+n+QcHIAEtPZ1ScdZ7CJtqUcLUTVOOwZM=
+  file: "$TRAVIS_TAG.x86.zip"
   skip_cleanup: true
   on:
-    tags: true
+    repo: k21971/EvilHack
   prerelease: false
   name: "Release build of EvilHack 0.5.0"
   body: "This is an auto generated Release build of EvilHack 0.5.0"
diff --git a/doc/evilhack-changelog.txt b/doc/evilhack-changelog.txt
@@ -877,5 +877,6 @@ Version 0.5.0
 - Fix: missing define in win/X11/winstat.c
 - Potential fix: src\do_name.c(1328) : error C4703: potentially uninitialized local
   pointer variable 'mtmp' used (windows/visual studio build)
+- Update travis.yml file
 - Latest merges from 'vanilla' NetHack 3.6.6 official release (as of March 7th, 2020)