upload-pack: move shallow_nr to upload_pack_data

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

diff --git a/.travis.yml b/.travis.yml
index 03c8e4c613015476fffe3f1e071c0c9d6609df0e..05f3e3f8d79117c1d32bf5e433d0fd49de93125c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,35 +8,39 @@ os:
   - linux
   - osx
 
+osx_image: xcode10.1
+
 compiler:
   - clang
   - gcc
 
 matrix:
   include:
-    - env: jobname=GIT_TEST_GETTEXT_POISON
+    - env: jobname=GETTEXT_POISON
       os: linux
       compiler:
       addons:
       before_install:
-    - env: jobname=Windows
+    - env: jobname=linux-gcc-4.8
+      os: linux
+      dist: trusty
+      compiler:
+    - env: jobname=Linux32
       os: linux
       compiler:
       addons:
+      services:
+        - docker
       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
+      script: ci/run-docker.sh
+    - env: jobname=linux-musl
       os: linux
       compiler:
       addons:
       services:
         - docker
       before_install:
-      script: ci/run-linux32-docker.sh
+      script: ci/run-docker.sh
     - env: jobname=StaticAnalysis
       os: linux
       compiler: