diff options
| author | Florian Bruhin <me@the-compiler.org> | 2020-07-08 17:20:43 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2020-07-08 17:20:43 +0200 |
| commit | 2130af688a0062900573519354d8c3a78d3d62e0 (patch) | |
| tree | 4defc81fb9f151b441edb337d2c6e9a21eb5eaf4 | |
| parent | 17b3eb77048918671c358bf164b064b15421b694 (diff) | |
| download | qutebrowser-2130af688a0062900573519354d8c3a78d3d62e0.tar.gz qutebrowser-2130af688a0062900573519354d8c3a78d3d62e0.zip | |
ci: Use PY_COLORS to force colored output
This should also color tox output, and it doesn't conflict with PYTEST_ADDOPTS
being used for coverage options.
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ad55be29..e1d6ed118 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,7 @@ name: CI on: [push, pull_request] +env: + PY_COLORS: "1" jobs: linters: @@ -161,8 +163,6 @@ jobs: python -m pip install -U pip python -m pip install -U -r misc/requirements/requirements-tox.txt - name: "Run ${{ matrix.testenv }}" - env: - PYTEST_ADDOPTS: "--color=yes" run: "tox -e ${{ matrix.testenv}} -- ${{ matrix.args }}" - name: Analyze backtraces run: "bash scripts/dev/ci/backtrace.sh ${{ matrix.testenv }}" @@ -14,7 +14,7 @@ setenv = pyqt{,57,59,510,511,512,513,514,515}: LINK_PYQT_SKIP=true pyqt{,57,59,510,511,512,513,514,515}: QUTE_BDD_WEBENGINE=true cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report= -passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI XDG_* QUTE_* DOCKER QT_QUICK_BACKEND PYTEST_ADDOPTS +passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI XDG_* QUTE_* DOCKER QT_QUICK_BACKEND PY_COLORS basepython = py3: {env:PYTHON:python3} py35: {env:PYTHON:python3.5} |