Przeglądaj źródła

Update CI command files to use new tools/distributions

bel2125 5 lat temu
rodzic
commit
4012cf51a8
2 zmienionych plików z 131 dodań i 3 usunięć
  1. 76 1
      .travis.yml
  2. 55 2
      appveyor.yml

+ 76 - 1
.travis.yml

@@ -753,6 +753,81 @@ matrix:
       NO_CACHING=NO
       ALLOW_WARNINGS=YES
 
+  -
+    os: linux
+    compiler: gcc
+    dist: bionic
+    env:
+      idx=21
+      N=GCCLinuxDefault_bionic
+      BUILD_TYPE=Release
+      ENABLE_SSL_DYNAMIC_LOADING=YES
+      OPENSSL_1_1=NO
+      ENABLE_CXX=NO
+      ENABLE_LUA_SHARED=NO
+      C_STANDARD=auto
+      CXX_STANDARD=auto
+      BUILD_SHARED=NO
+      NO_FILES=NO
+      ENABLE_SSL=YES
+      NO_CGI=NO
+      ENABLE_IPV6=NO
+      ENABLE_WEBSOCKETS=NO
+      ENABLE_LUA=NO
+      ENABLE_DUKTAPE=NO
+      NO_CACHING=NO
+      ALLOW_WARNINGS=YES
+
+  -
+    os: linux
+    compiler: gcc
+    dist: eoan
+    env:
+      idx=22
+      N=GCCLinuxDefault_eoan
+      BUILD_TYPE=Release
+      ENABLE_SSL_DYNAMIC_LOADING=YES
+      OPENSSL_1_1=NO
+      ENABLE_CXX=NO
+      ENABLE_LUA_SHARED=NO
+      C_STANDARD=auto
+      CXX_STANDARD=auto
+      BUILD_SHARED=NO
+      NO_FILES=NO
+      ENABLE_SSL=YES
+      NO_CGI=NO
+      ENABLE_IPV6=NO
+      ENABLE_WEBSOCKETS=NO
+      ENABLE_LUA=NO
+      ENABLE_DUKTAPE=NO
+      NO_CACHING=NO
+      ALLOW_WARNINGS=YES
+
+  -
+    os: linux
+    compiler: gcc
+    dist: focal
+    env:
+      idx=23
+      N=GCCLinuxDefault_focal
+      BUILD_TYPE=Release
+      ENABLE_SSL_DYNAMIC_LOADING=YES
+      OPENSSL_1_1=NO
+      ENABLE_CXX=NO
+      ENABLE_LUA_SHARED=NO
+      C_STANDARD=auto
+      CXX_STANDARD=auto
+      BUILD_SHARED=NO
+      NO_FILES=NO
+      ENABLE_SSL=YES
+      NO_CGI=NO
+      ENABLE_IPV6=NO
+      ENABLE_WEBSOCKETS=NO
+      ENABLE_LUA=NO
+      ENABLE_DUKTAPE=NO
+      NO_CACHING=NO
+      ALLOW_WARNINGS=YES
+
   - <<: *conan-linux
     env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49 CONAN_DOCKER_32_IMAGES=1
   - <<: *conan-linux
@@ -799,7 +874,7 @@ matrix:
 #          - clang-3.8
 #          - lua5.2
 #    env:
-#      idx=21
+#      idx=99
 #      N=Clang3.8-Linux-Complete-WithLua-Debug
 #      MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
 #      BUILD_TYPE=Debug

+ 55 - 2
appveyor.yml

@@ -212,8 +212,34 @@ environment:
       configuration: Release
       platform: x64
       image: Visual Studio 2013
-    # Visual Studio 2015 is default
-    # Visual Studio 2017 is not yet default
+    # Visual Studio 2015
+   - id: Full-VS2015-x86
+      compiler: msvc-19-seh
+      build_shared: NO
+      no_files: NO
+      enable_ipv6: YES
+      enable_ssl: YES
+      enable_websockets: YES
+      no_cgi: NO
+      no_caching: NO
+      enable_stats: YES
+      configuration: Release
+      platform: x86
+      image: Visual Studio 2015
+    - id: Full-VS2015-x64
+      compiler: msvc-19-seh
+      build_shared: NO
+      no_files: NO
+      enable_ipv6: YES
+      enable_ssl: YES
+      enable_websockets: YES
+      no_cgi: NO
+      no_caching: NO
+      enable_stats: YES
+      configuration: Release
+      platform: x64
+      image: Visual Studio 2015    
+    # Visual Studio 2017
     - id: Full-VS2017-x86
       compiler: msvc-20-seh
       build_shared: NO
@@ -240,6 +266,33 @@ environment:
       configuration: Release
       platform: x64
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    # Visual Studio 2019
+    - id: Full-VS2019-x86
+      compiler: msvc-21-seh
+      build_shared: NO
+      no_files: NO
+      enable_ipv6: YES
+      enable_ssl: YES
+      enable_websockets: YES
+      no_cgi: NO
+      no_caching: NO
+      enable_stats: YES
+      configuration: Release
+      platform: x86
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+    - id: Full-VS2019-x64
+      compiler: msvc-21-seh
+      build_shared: NO
+      no_files: NO
+      enable_ipv6: YES
+      enable_ssl: YES
+      enable_websockets: YES
+      no_cgi: NO
+      no_caching: NO
+      enable_stats: YES
+      configuration: Release
+      platform: x64
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019      
     # Experimental Ubuntu
     - id: Ubuntu1604-GCC-x64
       compiler: gcc-5.1.0-posix