upload-pack: move shallow_nr to upload_pack_data

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

diff --git a/.travis.yml b/.travis.yml
index 8d2499739eb4bbeb17065aef3fc8af54c9302d0b..05f3e3f8d79117c1d32bf5e433d0fd49de93125c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,20 +8,12 @@ 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
@@ -29,16 +21,10 @@ matrix:
       compiler:
       addons:
       before_install:
-    - env: jobname=Windows
+    - env: jobname=linux-gcc-4.8
       os: linux
+      dist: trusty
       compiler:
-      addons:
-      before_install:
-      script:
-        - >
-          test "$TRAVIS_REPO_SLUG" != "git/git" ||
-          ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
-      after_failure:
     - env: jobname=Linux32
       os: linux
       compiler:
@@ -46,26 +32,23 @@ matrix:
       services:
         - docker
       before_install:
-      script: ci/run-linux32-docker.sh
-    - env: jobname=StaticAnalysis
+      script: ci/run-docker.sh
+    - env: jobname=linux-musl
       os: linux
       compiler:
       addons:
-        apt:
-          packages:
-          - coccinelle
+      services:
+        - docker
       before_install:
+      script: ci/run-docker.sh
+    - env: jobname=StaticAnalysis
+      os: linux
+      compiler:
       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: