From 375fbd9419d075fe0f57dac103149f9201d40119 Mon Sep 17 00:00:00 2001
From: Leonid Yuriev <leo@yuriev.ru>
Date: Sat, 2 May 2020 20:52:18 +0300
Subject: [PATCH] mdbx: update/sync travis-ci config.

Change-Id: I37c5f3702163ba41558f0f0e7ec8a2bb28932551
---
 .travis.yml | 55 +++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 312aedef..e736d013 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,33 +1,52 @@
 language: c cpp
+sudo: false
+
+env:
+  global:
+   - secure: "M+W+heGGyRQJoBq2W0uqWVrpL4KBXmL0MFL7FSs7f9vmAaDyEgziUXeZRj3GOKzW4kTef3LpIeiu9SmvqSMoQivGGiomZShqPVl045o/OUgRCAT7Al1RLzEZ0efSHpIPf0PZ6byEf6GR2ML76OfuL6JxTVdnz8iVyO2sgLE1HbX1VeB+wgd/jfMeOBhCCXskfK6MLyZihfMYsiYZYSaV98ZDhDLSlzuuRIgzb0bMi8aL6AErs0WLW0NelRBeHkKPYfAUc85pdQHscgrJw6Rh/zT6+8BQ/q5f4IgWhiu4xoRg3Ngl7SNoedRQh93ADM3UG2iGl6HDFpVORaXcFWKAtuYY+kHQ0HB84BRYpQmeBuXNpltsfxQ3d1Q3u0RlE45zRvmr2+X1mFnkcNUAWISLPbsOUlriDQM8irGwRpho77/uYnRC00bJsHW//s6+uPf9zrAw1nI4f0y3PAWukGF/xs6HAI3FZPsuSSnx18Tj3Opgbc9Spop+V3hkhdiJoPGpNKTkFX4ZRXfkPgoRVJmtp4PpbpH0Ps/mCriKjMEfGGi0HcVCi0pEGLXiecdqJ5KPg5+22zNycEujQBJcNTKd9shN+R3glrbmhAxTEzGdGwxXXJ2ybwJ2PWJLMYZ7g98nLyX+uQPaA3BlsbYJHNeS5283/9pJsd9DzfHKsN2nFSc="
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - cmake
+      - clang-format
+    update: true
 
 matrix:
   include:
     - os: linux
-      dist: trusty
+      dist: focal
+      compiler: gcc
       env: CC=cc CXX=c++
     - os: linux
-      dist: trusty
+      dist: focal
+      compiler: clang
+      env: CC=clang CXX=clang++
+    - os: linux
+      dist: bionic
+      compiler: gcc
+      env: CC=cc CXX=c++
+    - os: linux
+      dist: bionic
       compiler: clang
       env: CC=clang CXX=clang++
     - os: linux
       dist: xenial
       compiler: gcc
-      env: CC=gcc CXX=g++
+      env: CC=cc CXX=c++
     - os: linux
-      dist: bionic
+      dist: xenial
       compiler: clang
       env: CC=clang CXX=clang++
     - os: osx
-      osx_image: xcode11
+      osx_image: xcode11.3
       env: CC=cc CXX=c++
     - os: osx
       osx_image: xcode9.4
       env: CC=cc CXX=c++
 
-env:
-  global:
-   - secure: "M+W+heGGyRQJoBq2W0uqWVrpL4KBXmL0MFL7FSs7f9vmAaDyEgziUXeZRj3GOKzW4kTef3LpIeiu9SmvqSMoQivGGiomZShqPVl045o/OUgRCAT7Al1RLzEZ0efSHpIPf0PZ6byEf6GR2ML76OfuL6JxTVdnz8iVyO2sgLE1HbX1VeB+wgd/jfMeOBhCCXskfK6MLyZihfMYsiYZYSaV98ZDhDLSlzuuRIgzb0bMi8aL6AErs0WLW0NelRBeHkKPYfAUc85pdQHscgrJw6Rh/zT6+8BQ/q5f4IgWhiu4xoRg3Ngl7SNoedRQh93ADM3UG2iGl6HDFpVORaXcFWKAtuYY+kHQ0HB84BRYpQmeBuXNpltsfxQ3d1Q3u0RlE45zRvmr2+X1mFnkcNUAWISLPbsOUlriDQM8irGwRpho77/uYnRC00bJsHW//s6+uPf9zrAw1nI4f0y3PAWukGF/xs6HAI3FZPsuSSnx18Tj3Opgbc9Spop+V3hkhdiJoPGpNKTkFX4ZRXfkPgoRVJmtp4PpbpH0Ps/mCriKjMEfGGi0HcVCi0pEGLXiecdqJ5KPg5+22zNycEujQBJcNTKd9shN+R3glrbmhAxTEzGdGwxXXJ2ybwJ2PWJLMYZ7g98nLyX+uQPaA3BlsbYJHNeS5283/9pJsd9DzfHKsN2nFSc="
-
 before_script: |
   if [ "${TRAVIS_BRANCH}" = "coverity_scan" ]; then
     # call Coverity Scan manually of addons.coverity_scan for first job only
@@ -38,11 +57,6 @@ before_script: |
     else
       echo 'echo "Skip CoverityScan for unrelated os/compiler"' > coverity_scan.sh
     fi
-  elif [ "${TRAVIS_JOB_NUMBER}" = "${TRAVIS_BUILD_NUMBER}.1" ] && make reformat && [[ -n $(git diff) ]]; then
-    echo "You must run 'make reformat' before submitting a pull request"
-    echo ""
-    git diff
-    exit -1
   fi
 
 script: |
@@ -59,3 +73,16 @@ script: |
     COVERITY_SCAN_BRANCH_PATTERN="$TRAVIS_BRANCH" \
       bash ./coverity_scan.sh || cat cov-int/scm_log.txt
   fi
+
+after_script: |
+  if [ "${TRAVIS_BRANCH}" != "coverity_scan" -a "${TRAVIS_JOB_NUMBER}" = "${TRAVIS_BUILD_NUMBER}.1" ] && make reformat && [[ -n $(git diff) ]]; then
+    echo "You must run 'make reformat' before submitting a pull request"
+    echo "-------------------------------------------------------------------------------"
+    git diff
+    sleep 1
+    echo "-------------------------------------------------------------------------------"
+    sleep 1
+    exit -1
+  fi
+  echo "-------------------------------------------------------------------------------"
+  sleep 1