From: Joel Rosdahl <joel@rosdahl.net>
Date: Thu, 18 Jun 2020 19:13:27 +0000 (+0200)
Subject: Fix numbering of Travis CI jobs
X-Git-Tag: v4.0~388
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f61dd2d582adb47fedbf4d397845ab7c0b1bc7e5;p=thirdparty%2Fccache.git

Fix numbering of Travis CI jobs

The “allow_failures” one are always listed last, so move them last in
.travis.yml as well.
---

diff --git a/.travis.yml b/.travis.yml
index cd3ac348e..565631225 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -101,69 +101,67 @@ jobs:
         packages:
         - libzstd1-dev
 
-  # Job 11: Run Clang-Tidy
+  # Job 11: Build binary package, extract it out of source, run tests.
   - os: linux
-    compiler: clang
-    env: T="Clang-Tidy" VERBOSE=1 CMAKE_PARAMS="-DENABLE_CLANG_TIDY=ON" RUN_TESTS=0
+    env: T="Build binary and verify" VERBOSE=1 SPECIAL=build_and_verify_package
     addons:
       apt:
         packages:
+        - elfutils
         - libzstd1-dev
 
-  # Job 12: Run Clang-Format in check mode
+  # Job 12: Build source package, extract it out of source, run tests.
   - os: linux
-    compiler: clang
-    env: T="Clang-Format" VERBOSE=1 BUILDEXTRAFLAGS="--target check_format" RUN_TESTS=0
+    env: T="Build source package and verify" VERBOSE=1 SPECIAL=build_and_verify_package_source
     addons:
       apt:
         packages:
+        - elfutils
         - libzstd1-dev
-    before_install:
-    - pip install --user cmake_format
 
-  # Job 13: Build binary package, extract it out of source, run tests.
+  # Job 13: Build documentation
   - os: linux
-    env: T="Build binary and verify" VERBOSE=1 SPECIAL=build_and_verify_package
+    env: T="Build documentation" VERBOSE=1 BUILDEXTRAFLAGS="--target documentation" RUN_TESTS=0
     addons:
       apt:
         packages:
         - elfutils
         - libzstd1-dev
+        - asciidoc
 
-  # Job 14: Build source package, extract it out of source, run tests.
+  # Job 14: Build manpage
   - os: linux
-    env: T="Build source package and verify" VERBOSE=1 SPECIAL=build_and_verify_package_source
+    env: T="Build manpage" VERBOSE=1 BUILDEXTRAFLAGS="--target manpage" RUN_TESTS=0
     addons:
       apt:
         packages:
         - elfutils
         - libzstd1-dev
+        - asciidoc
+        - xsltproc
 
-  # Job 15: Build documentation
+  # Job 15: Run Clang-Tidy
   - os: linux
-    env: T="Build documentation" VERBOSE=1 BUILDEXTRAFLAGS="--target documentation" RUN_TESTS=0
+    compiler: clang
+    env: T="Clang-Tidy" VERBOSE=1 CMAKE_PARAMS="-DENABLE_CLANG_TIDY=ON" RUN_TESTS=0
     addons:
       apt:
         packages:
-        - elfutils
         - libzstd1-dev
-        - asciidoc
 
-  # Job 16: Build manpage
+  # Job 16: Run Clang-Format in check mode
   - os: linux
-    env: T="Build manpage" VERBOSE=1 BUILDEXTRAFLAGS="--target manpage" RUN_TESTS=0
+    compiler: clang
+    env: T="Clang-Format" VERBOSE=1 BUILDEXTRAFLAGS="--target check_format" RUN_TESTS=0
     addons:
       apt:
         packages:
-        - elfutils
         - libzstd1-dev
-        - asciidoc
-        - xsltproc
+    before_install:
+    - pip install --user cmake_format
 
-  # New jobs go here until they are established for some weeks
   allow_failures:
-
-  # Job 11: Run Clang-Tidy
+  # Job 15: Run Clang-Tidy
   - os: linux
     compiler: clang
     env: T="Clang-Tidy" VERBOSE=1 CMAKE_PARAMS="-DENABLE_CLANG_TIDY=ON" RUN_TESTS=0
@@ -172,7 +170,7 @@ jobs:
         packages:
         - libzstd1-dev
 
-  # Job 12: Run Clang-Format check mode
+  # Job 16: Run Clang-Format check mode
   - os: linux
     compiler: clang
     env: T="Clang-Format" VERBOSE=1 BUILDEXTRAFLAGS="--target check_format" RUN_TESTS=0