Merge pull request #641 from johnmcfarlane/faster-osx-build

Don't update brew packages
johnmcfarlane · Aug 25, 2020 · 40f3fae · 40f3fae
2 parents 507220f + aca2b06
commit 40f3fae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,39 +6,39 @@ os: linux
 
 jobs:
   include:
-    - name: Linux/Clang 10, Clang-Tidy
-      os: linux
-      env: IMG=cnl_ci:clang-10 SCRIPT=test/scripts/clang-tidy.sh STANDARD=20 TOOLCHAIN=clang
-
     - name: OS X/GCC 8, Unit test
       os: osx
       osx_image: xcode11.2
       env: CC=gcc-8 CXX=g++-8 PACKAGE=gcc@8 VERSION=8 SCRIPT=test/scripts/unit-test.sh
 
+    - name: OS X/GCC 6, Unit test
+      os: osx
+      osx_image: xcode10
+      env: CC=gcc-6 CXX=g++-6 PACKAGE=gcc@6 VERSION=6 SCRIPT=test/scripts/unit-test.sh STANDARD=14 INT128=OFF
+
+    - name: OS X/Clang 5.0.2, Unit test
+      os: osx
+      compiler: clang
+      env: CC=clang CXX=clang++ STANDARD=14 SCRIPT=test/scripts/unit-test.sh EXCEPTIONS=OFF TOOLCHAIN=clang
+
+    - name: Linux/Clang 10, Clang-Tidy
+      os: linux
+      env: IMG=cnl_ci:clang-10 SCRIPT=test/scripts/clang-tidy.sh STANDARD=20 TOOLCHAIN=clang
+
     - name: Linux/Clang 10, Benchmark
       os: linux
       env: IMG=cnl_ci:clang-10 SCRIPT=test/scripts/benchmark.sh STANDARD=20 TOOLCHAIN=clang GENERATOR="Unix Makefiles"
     - name: Linux/Clang 10, Sanitize
       os: linux
       env: IMG=cnl_ci:clang-10 SCRIPT=test/scripts/sanitize-clang.sh STANDARD=20 TOOLCHAIN=clang
 
-    - name: OS X/GCC 6, Unit test
-      os: osx
-      osx_image: xcode10
-      env: CC=gcc-6 CXX=g++-6 PACKAGE=gcc@6 VERSION=6 SCRIPT=test/scripts/unit-test.sh STANDARD=14 INT128=OFF
-
     - name: Linux/GCC 10, Benchmark
       os: linux
       env: IMG=cnl_ci:gcc-10 SCRIPT=test/scripts/benchmark.sh STANDARD=20
     - name: Linux/GCC 10, Sanitize
       os: linux
       env: IMG=cnl_ci:gcc-10 SCRIPT=test/scripts/sanitize-gcc.sh STANDARD=20 GENERATOR="Unix Makefiles"
 
-    - name: OS X/Clang 5.0.2, Unit test
-      os: osx
-      compiler: clang
-      env: CC=clang CXX=clang++ STANDARD=14 SCRIPT=test/scripts/unit-test.sh EXCEPTIONS=OFF TOOLCHAIN=clang
-
     - name: Linux/Clang 7, Unit test
       os: linux
       env: IMG=cnl_ci:clang-7 SCRIPT=test/scripts/unit-test.sh TOOLCHAIN=clang

diff --git a/.travis/test-osx.sh b/.travis/test-osx.sh
@@ -15,7 +15,6 @@ export NUM_CPUS=4
 PROJECT_DIR="${TRAVIS_BUILD_DIR}"
 
 # Before install
-brew update
 brew unlink python@2
 
 # Install