Revert "[DO NOT MERGE] Run several times under Travis"

This reverts commit 3fb850a.
Kitura · Dec 18, 2018 · 53efd57 · 53efd57
1 parent 3fb850a
commit 53efd57
Showing 1 changed file with 14 additions and 47 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,19 +14,14 @@ matrix:
     - os: linux
       dist: trusty
       sudo: required
-      services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04
+      env: SWIFT_SNAPSHOT=4.0.3
     - os: linux
       dist: trusty
       sudo: required
-      services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
-      # Test GCD_ASYNCH codepath on Linux
+      env: SWIFT_SNAPSHOT=4.1.3
     - os: linux
       dist: trusty
       sudo: required
-      services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT CUSTOM_TEST_SCRIPT=testWithGCD.sh DOCKER_ENVIRONMENT=CUSTOM_TEST_SCRIPT
     - os: linux
       dist: trusty
       sudo: required
@@ -47,50 +42,22 @@ matrix:
       dist: trusty
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04
-    - os: linux
-      dist: trusty
+      env: DOCKER_IMAGE=ubuntu:18.04
+    - os: osx
+      osx_image: xcode9.2
       sudo: required
-      services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
-      # Test GCD_ASYNCH codepath on Linux
-    - os: linux
-      dist: trusty
+      env: SWIFT_SNAPSHOT=4.0.3
+    - os: osx
+      osx_image: xcode9.4
       sudo: required
-      services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT CUSTOM_TEST_SCRIPT=testWithGCD.sh DOCKER_ENVIRONMENT=CUSTOM_TEST_SCRIPT
-    - os: linux
-      dist: trusty
+      env: SWIFT_SNAPSHOT=4.1.2 JAZZY_ELIGIBLE=true
+    - os: osx
+      osx_image: xcode10
       sudo: required
-      services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04
-    - os: linux
-      dist: trusty
+    - os: osx
+      osx_image: xcode10.1
       sudo: required
-      services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
-      # Test GCD_ASYNCH codepath on Linux
-    - os: linux
-      dist: trusty
-      sudo: required
-      services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT CUSTOM_TEST_SCRIPT=testWithGCD.sh DOCKER_ENVIRONMENT=CUSTOM_TEST_SCRIPT
-    - os: linux
-      dist: trusty
-      sudo: required
-      services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04
-    - os: linux
-      dist: trusty
-      sudo: required
-      services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
-      # Test GCD_ASYNCH codepath on Linux
-    - os: linux
-      dist: trusty
-      sudo: required
-      services: docker
-      env: DOCKER_IMAGE=ubuntu:16.04 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT CUSTOM_TEST_SCRIPT=testWithGCD.sh DOCKER_ENVIRONMENT=CUSTOM_TEST_SCRIPT
+      env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
 
 before_install:
   - git clone https://github.com/IBM-Swift/Package-Builder.git