revert #6758

.travis.yml

@@ -1,3 +1,6 @@
+os:
+  - osx
+  - linux
 language: generic
 sudo: required
 
@@ -12,27 +15,9 @@ before_install:
         rm -rf /home/travis/perl5/ /home/travis/.phpenv /home/travis/gopath /home/travis/otp
         rm -rf /home/travis/.gimme/ /home/travis/.rvm /home/travis/.nvm
       fi
-
 install: scripts/travis-setup.sh
 
-jobs:
-  include:
-    # in forks, master and bulk, we run osx and linux in parallel on each push
-    - stage: Linux+macOS
-      if: (type = push) AND ((branch IN (master, bulk)) OR (fork = true))
-      os:
-        - linux
-        - osx
-      script: scripts/travis-run.sh
-    # in pull requests, we first run linux and only if that succeeds, we run osx
-    - stage: Linux
-      if: type = pull_request
-      os: linux
-      script: scripts/travis-run.sh
-    - stage: macOS
-      if: type = pull_request
-      os: osx
-      script: scripts/travis-run.sh
+script: scripts/travis-run.sh
 
 env:
   global: