scepclient: Avoid name conflict with global PKCS#7 chunk

[thirdparty/strongswan.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 3cf29319b4949f9fd8a5a202991bb12aa221c893..68db3ac9ba0c6636ab831b6d9b7ee224efd351bd 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,12 @@
 language: c
 
 sudo: required
-dist: xenial
+dist: bionic
 
 # don't build tags separately
 if: tag IS blank
 
-compiler:
-  - gcc
-  - clang
+compiler: gcc
 
 cache: ccache
 
@@ -29,51 +27,79 @@ after_success:
 
 after_failure:
   - cat config.log
+  - sleep 1
 
 env:
   global:
     - TESTS_REDUCED_KEYLENGTHS=yes
     - LEAK_DETECTIVE=no
     - MONOLITHIC=no
-  matrix:
-    - TEST=all
-    - TEST=all MONOLITHIC=yes
-    - TEST=all LEAK_DETECTIVE=yes
-    - TEST=default
-    - TEST=default MONOLITHIC=yes
-    - TEST=default LEAK_DETECTIVE=yes
-    - TEST=botan
-    - TEST=botan LEAK_DETECTIVE=yes
-    - TEST=openssl
-    - TEST=openssl LEAK_DETECTIVE=yes
-    - TEST=gcrypt
-    - TEST=gcrypt LEAK_DETECTIVE=yes
-    # we can't test Vstr as negative int args are not properly passed to CBs
-    - TEST=printf-builtin
-    - TEST=printf-builtin LEAK_DETECTIVE=yes
 
 matrix:
   include:
-    - compiler: clang
-      os: osx
-      env: TEST=osx
-    - compiler: gcc
-      env: TEST=sonarcloud
-      if: env(SONAR_TOKEN) IS present
+    - env: TEST=sonarcloud
+      if: type = push AND env(SONAR_TOKEN) IS present
       git:
         depth: false
       addons:
         sonarcloud:
           organization: "strongswan"
-    - compiler: gcc
-      env: TEST=coverage
-    - compiler: clang
-      env: TEST=fuzzing MONOLITHIC=yes
-    - compiler: gcc
-      env: TEST=dist
-    - compiler: gcc
-      env: TEST=apidoc
-    - compiler: gcc
-      env: TEST=win64 MONOLITHIC=yes
-    - compiler: gcc
-      env: TEST=win32 MONOLITHIC=yes
+    - env: TEST=osx
+      compiler: clang
+      os: osx
+    - env: TEST=all
+    - env: TEST=all
+      compiler: clang
+    - env: TEST=all
+      arch: arm64
+    - env: TEST=all
+      arch: ppc64le
+    - env: TEST=all
+      arch: s390x
+    - env: TEST=all
+      dist: xenial
+    - env: TEST=all
+      dist: xenial
+      compiler: clang
+    - env: TEST=all MONOLITHIC=yes
+    - env: TEST=all MONOLITHIC=yes
+      compiler: clang
+    - env: TEST=all LEAK_DETECTIVE=yes
+    - env: TEST=all LEAK_DETECTIVE=yes
+      compiler: clang
+    - env: TEST=coverage
+    - env: TEST=fuzzing MONOLITHIC=yes
+      compiler: clang
+    - env: TEST=win64 MONOLITHIC=yes
+    - env: TEST=win32 MONOLITHIC=yes
+    - env: TEST=dist
+    # "default" with GCC is already tested with "dist" above
+    - env: TEST=default
+      compiler: clang
+    - env: TEST=default MONOLITHIC=yes
+    - env: TEST=default MONOLITHIC=yes
+      compiler: clang
+    - env: TEST=default LEAK_DETECTIVE=yes
+    - env: TEST=default LEAK_DETECTIVE=yes
+      compiler: clang
+    # we can't test Vstr as negative int args are not properly passed to CBs
+    - env: TEST=printf-builtin
+    - env: TEST=printf-builtin
+      compiler: clang
+    - env: TEST=printf-builtin LEAK_DETECTIVE=yes
+    - env: TEST=printf-builtin LEAK_DETECTIVE=yes
+      compiler: clang
+    # the crypto plugins are build-tested with clang via "all" above
+    - env: TEST=botan
+    - env: TEST=botan LEAK_DETECTIVE=yes
+    - env: TEST=wolfssl
+    - env: TEST=wolfssl LEAK_DETECTIVE=yes
+    - env: TEST=openssl
+    - env: TEST=openssl LEAK_DETECTIVE=yes
+    - env: TEST=openssl-1.0
+      dist: xenial
+    - env: TEST=openssl-1.0 LEAK_DETECTIVE=yes
+      dist: xenial
+    - env: TEST=gcrypt
+    - env: TEST=gcrypt LEAK_DETECTIVE=yes
+    - env: TEST=apidoc