From 1aedb9ed00e40f54bb3303ab6d2da4a0f6e2fbb6 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 2 Aug 2019 15:48:32 +0200 Subject: [PATCH] ci: Travis: move coverage job to first stage (#10673) This swaps it with "gcc-32bit". It is better to have the "coverage" job run than "gcc-32bit" in case of flaky build failures - especially on master, since otherwise no base coverage is available for future PRs. --- .travis.yml | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6fde09b3c3..cc6ea79e84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,31 +100,6 @@ jobs: - 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 - # Minimum required CMake. - - CMAKE_URL=https://cmake.org/files/v2.8/cmake-2.8.12-Linux-i386.sh - - *common-job-env - - if: branch = master AND commit_message !~ /\[skip.lint\]/ - name: lint - os: linux - env: - - CI_TARGET=lint - - *common-job-env - - - stage: second stage - name: "macOS: clang" - os: osx - compiler: clang - osx_image: xcode10.2 # macOS 10.14 - env: - - *common-job-env - - name: gcc-coverage (gcc 9) os: linux compiler: gcc-9 @@ -140,6 +115,31 @@ jobs: packages: - *common-apt-packages - gcc-9 + - if: branch = master AND commit_message !~ /\[skip.lint\]/ + name: lint + os: linux + env: + - CI_TARGET=lint + - *common-job-env + + - stage: second stage + name: "macOS: clang" + os: osx + compiler: clang + osx_image: xcode10.2 # macOS 10.14 + env: + - *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 + # Minimum required CMake. + - CMAKE_URL=https://cmake.org/files/v2.8/cmake-2.8.12-Linux-i386.sh + - *common-job-env - name: clang-tsan os: linux