From 43c2cccc17b35f476d89f6569a9c25f64a0f82ff Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Tue, 27 Nov 2018 17:39:52 +0100
Subject: [PATCH] travis: Set "os: linux" globally

---
 .travis.yml | 58 ++++++++++++++++++-----------------------------------
 1 file changed, 20 insertions(+), 38 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5a8965fd4..62431a8e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,32 +2,25 @@ dist: xenial
 language: python
 group: edge
 python: 3.6
+os: linux
 
 matrix:
   include:
-    - os: linux
-      env: DOCKER=archlinux
+    - env: DOCKER=archlinux
       services: docker
-    - os: linux
-      env: DOCKER=archlinux-webengine QUTE_BDD_WEBENGINE=true
+    - env: DOCKER=archlinux-webengine QUTE_BDD_WEBENGINE=true
       services: docker
-    - os: linux
-      env: TESTENV=py36-pyqt571
-    - os: linux
-      python: 3.5
+    - env: TESTENV=py36-pyqt571
+    - python: 3.5
       env: TESTENV=py35-pyqt571
-    - os: linux
-      env: TESTENV=py36-pyqt59
-    - os: linux
-      env: TESTENV=py36-pyqt510
+    - env: TESTENV=py36-pyqt59
+    - env: TESTENV=py36-pyqt510
       addons:
         apt:
           packages:
           - xfonts-base
-    - os: linux
-      env: TESTENV=py36-pyqt511-cov
-    - os: linux
-      python: 3.7
+    - env: TESTENV=py36-pyqt511-cov
+    - python: 3.7
       env: TESTENV=py37-pyqt511
     - os: osx
       env: TESTENV=py37 OSX=sierra
@@ -37,40 +30,29 @@ matrix:
     # - os: osx
     #   env: TESTENV=py35 OSX=yosemite
     #   osx_image: xcode6.4
-    - os: linux
-      env: TESTENV=pylint
-    - os: linux
-      env: TESTENV=flake8
-    - os: linux
-      env: TESTENV=mypy
-    - os: linux
-      env: TESTENV=docs
+    - env: TESTENV=pylint
+    - env: TESTENV=flake8
+    - env: TESTENV=mypy
+    - env: TESTENV=docs
       addons:
          apt:
            packages:
            - asciidoc
-    - os: linux
-      env: TESTENV=vulture
-    - os: linux
-      env: TESTENV=misc
-    - os: linux
-      env: TESTENV=pyroma
-    - os: linux
-      env: TESTENV=check-manifest
-    - os: linux
-      env: TESTENV=eslint
+    - env: TESTENV=vulture
+    - env: TESTENV=misc
+    - env: TESTENV=pyroma
+    - env: TESTENV=check-manifest
+    - env: TESTENV=eslint
       language: node_js
       python: null
       node_js: "lts/*"
-    - os: linux
-      language: generic
+    - language: generic
       env: TESTENV=shellcheck
       services: docker
   fast_finish: true
   allow_failures:
     # https://github.com/qutebrowser/qutebrowser/issues/4055
-    - os: linux
-      env: TESTENV=py36-pyqt510
+    - env: TESTENV=py36-pyqt510
 
 cache:
   directories: