Merge branch 'br/commit-tree-fully-spelled-gpg-sign-option'

[thirdparty/git.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 8d2499739eb4bbeb17065aef3fc8af54c9302d0b..36cbdea7f4f37e7eb4d5172daa4431cffcb4b46c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,23 +8,15 @@ os:
   - linux
   - osx
 
+osx_image: xcode10.1
+
 compiler:
   - clang
   - gcc
 
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - language-pack-is
-    - git-svn
-    - apache2
-    - gcc-8
-
 matrix:
   include:
-    - env: jobname=GETTEXT_POISON
+    - env: jobname=GIT_TEST_GETTEXT_POISON
       os: linux
       compiler:
       addons:
@@ -50,22 +42,11 @@ matrix:
     - env: jobname=StaticAnalysis
       os: linux
       compiler:
-      addons:
-        apt:
-          packages:
-          - coccinelle
-      before_install:
       script: ci/run-static-analysis.sh
       after_failure:
     - env: jobname=Documentation
       os: linux
       compiler:
-      addons:
-        apt:
-          packages:
-          - asciidoc
-          - xmlto
-      before_install:
       script: ci/test-documentation.sh
       after_failure: