From b4f95fe089e5ca09f268dd09b437dfc43fc85f8d Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 3 Dec 2020 11:10:16 +0100 Subject: ci: Use Python in PATH in ci.yml (cherry picked from commit 627402887215665be1d57408156e64442f6ac17a) (cherry picked from commit 9774208b63bb00e169376c25c68983beae6709e9) --- .github/workflows/ci.yml | 2 +- tox.ini | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31b3d74ca..b0e3a2d81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,7 +90,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up problem matchers run: "python scripts/dev/ci/problemmatchers.py py38 ${{ runner.temp }}" - - run: tox -e py38 + - run: tox -e py tests: if: "!contains(github.event.head_commit.message, '[ci skip]')" diff --git a/tox.ini b/tox.ini index 385ecd8cd..e71e1f4d3 100644 --- a/tox.ini +++ b/tox.ini @@ -17,6 +17,7 @@ setenv = 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 PY_COLORS basepython = + py: {env:PYTHON:python3} py3: {env:PYTHON:python3} py35: {env:PYTHON:python3.5} py36: {env:PYTHON:python3.6} -- cgit v1.2.3-54-g00ecf