travis: Set "os: linux" globally

This commit is contained in:
Florian Bruhin 2018-11-27 17:39:52 +01:00
parent 07c632869d
commit 43c2cccc17

View File

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