From d34849a2c4948348b5b505ff3744bd837447bc0a Mon Sep 17 00:00:00 2001
From: Vitaly Chikunov <vt@altlinux.org>
Date: Sun, 2 Feb 2020 21:23:04 +0300
Subject: [PATCH] travis-ci: Optimize and rearrange .travis.yml

- Remove redundant 'os: linux', 'compiler: gcc' tags.
- Order jobs: x86_64 builds, analysers, other arches, other OSes.
- Mark openssl-master build as 'allow_failures' for PRs.
- Build all jobs against 'OpenSSL_1_1_1-stable' by default.
- Do not include 'linux/arch' in the job name, because Travis show
  them already.
- Split name by ' | ' instead of '/' so it's easier to understand.
---
 .travis.yml | 52 ++++++++++++++++++++--------------------------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e3eb43c..d25e151 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,54 +8,42 @@ env:
   global:
     - PREFIX=${HOME}/opt
     - PATH=${PREFIX}/bin:${PATH}
-    - OPENSSL_BRANCH=master
+    - OPENSSL_BRANCH=OpenSSL_1_1_1-stable
 
 matrix:
   include:
-    - name: linux/gcc/x86_64/openssl-master
-      os: linux
-      compiler: gcc
-    - name: linux/clang/x86_64/openssl-master
-      os: linux
+    - name: gcc | openssl-stable
+    - name: clang | openssl-stable
       compiler: clang
-    - name: linux/gcc/i386/openssl-master
-      os: linux
-      compiler: gcc
-      env: CFLAGS=-m32 LDFLAGS=-m32 SETARCH="setarch i386" APT_INSTALL=gcc-multilib
-    - name: linux/gcc/x86_64/openssl-1.1.1
-      os: linux
-      compiler: gcc
-      env: OPENSSL_BRANCH=OpenSSL_1_1_1-stable
-      if: type != cron
-    - name: linux/gcc/ppc64le/openssl-master
-      os: linux
-      arch: ppc64le
-      compiler: gcc
-    - name: linux/gcc+ASan/x86_64/openssl-master
+    - name: gcc | openssl-master
+      env: OPENSSL_BRANCH=master
+    # Dynamic and static analysers
+    - name: gcc+ASan | openssl-stable
       env: ASAN=-DASAN=1
-      os: linux
-      compiler: gcc
-    - name: linux/gcc+Coverity/x86_64 (cron)
+    - name: gcc+Coverity | openssl-stable (cron)
       env: COVERITY_SCAN_PROJECT_NAME="gost-engine" COVERITY_SCAN_BRANCH_PATTERN="*" COVERITY_SCAN_NOTIFICATION_EMAIL="beldmit@gmail.com" COVERITY_SCAN_BUILD_COMMAND="make"
       if: type == cron
-      os: linux
-      compiler: gcc
       script:
         - mkdir build
         - cd build
         - cmake -DOPENSSL_ROOT_DIR=${PREFIX} -DOPENSSL_LIBRARIES=${PREFIX}/lib -DOPENSSL_ENGINES_DIR=${PREFIX}/engines ..
         - curl -s "https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh" | bash || true
-    - name: linux/gcc/arm64/openssl-master
-      os: linux
+    # Other arches
+    - name: gcc | openssl-stable
+      env: CFLAGS=-m32 LDFLAGS=-m32 SETARCH="setarch i386" APT_INSTALL=gcc-multilib
+    - name: gcc | openssl-stable
+      arch: ppc64le
+    - name: gcc | openssl-stable
       arch: arm64
-      compiler: gcc
-    - name: linux/gcc/s390x/openssl-master
-      os: linux
+    - name: gcc | openssl-stable
       arch: s390x
-      compiler: gcc
-    - name: osx/clang/x86_64/openssl-master
+    # Non-linux
+    - name: clang | openssl-stable
       os: osx
       compiler: clang
+  allow_failures:
+      env: OPENSSL_BRANCH=master
+      if: type == pull_request
 
 before_script:
   - curl -L https://cpanmin.us | sudo perl - --sudo App::cpanminus
-- 
2.39.2