From 38342d75f64e0825505bbb6ff6e1a67b12bf3f17 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 7 Jul 2019 18:07:01 +0200
Subject: [PATCH] ci: fix/improve Travis cache handling  [skip appveyor]
 (#10412)

This is meant to not fall back to using the cache for the "master"
target branch, for release pull requests (targeting not "master").

(Travis builds the cache key based on all (explicit) job environment
variables)
---
 .travis.yml | 65 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 47 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c7c824afc0..1ccfe0f3ab 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,47 +47,76 @@ env:
     - CCACHE_SLOPPINESS=time_macros,file_macro
     - CCACHE_BASEDIR="$TRAVIS_BUILD_DIR"
 
+anchors:
+  envs: &common-job-env
+    # Do not fall back to cache for "master" for PR on "release" branch:
+    # adds the target branch to the cache key.
+    FOR_TRAVIS_CACHE=$TRAVIS_BRANCH
+
 jobs:
   include:
     - stage: baseline
+      name: clang-asan
       os: linux
       compiler: clang-4.0
       # Use Lua so that ASAN can test our embedded Lua support. 8fec4d53d0f6
-      env: >
-        CLANG_SANITIZER=ASAN_UBSAN
-        CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
-        ASAN_SYMBOLIZE=asan_symbolize-4.0
-    - os: linux
+      env:
+        - CLANG_SANITIZER=ASAN_UBSAN
+        - CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
+        - ASAN_SYMBOLIZE=asan_symbolize-4.0
+        - *common-job-env
+    - name: gcc-functionaltest-lua
+      os: linux
       compiler: gcc
-      env: >
-        FUNCTIONALTEST=functionaltest-lua
-        CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
-        DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF"
-    - os: linux
+      env:
+        - FUNCTIONALTEST=functionaltest-lua
+        - CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
+        - DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF"
+        - *common-job-env
+    - name: gcc-32bit
+      os: linux
       # Travis creates a cache per compiler. Set a different value here to
       # store 32-bit dependencies in a separate cache.
       compiler: gcc
-      env: BUILD_32BIT=ON
+      env:
+        - BUILD_32BIT=ON
+        - *common-job-env
     - if: branch = master AND commit_message !~ /\[skip.lint\]/
+      name: lint
       os: linux
-      env: CI_TARGET=lint
+      env:
+        - CI_TARGET=lint
+        - *common-job-env
 
     - stage: second stage
+      name: "macOS: clang"
       os: osx
       compiler: clang
       osx_image: xcode10.2  # macOS 10.14
-    - os: osx
+      env:
+        - *common-job-env
+    - name: "macOS: gcc"
+      os: osx
       compiler: gcc
       osx_image: xcode10.2  # macOS 10.14
+      env:
+        - *common-job-env
 
-    - os: linux
+    - name: gcc-coverage
+      os: linux
       compiler: gcc
-      env: GCOV=gcov CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
-    - os: linux
+      env:
+        - GCOV=gcov
+        - CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
+        - *common-job-env
+    - name: clang-tsan
+      os: linux
       compiler: clang
-      env: CLANG_SANITIZER=TSAN
+      env:
+        - CLANG_SANITIZER=TSAN
+        - *common-job-env
   allow_failures:
-    - env: CLANG_SANITIZER=TSAN
+    - name: clang-tsan
   fast_finish: true
 
 before_install: ci/before_install.sh