summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-03-24 14:12:36 +0100
committerFlorian Bruhin <me@the-compiler.org>2021-03-24 14:12:36 +0100
commit2f592f7ce6414e3c071eaa6df86bf34b6a213bdf (patch)
treee65f177e655544d756c52b880781d27b2016bfa5 /.github
parentfdc21e10dd2b8d11d3f2798b8a3a490ec67c9377 (diff)
parent41bcada133b7235db698a2354df27585438b6a4b (diff)
downloadqutebrowser-2f592f7ce6414e3c071eaa6df86bf34b6a213bdf.tar.gz
qutebrowser-2f592f7ce6414e3c071eaa6df86bf34b6a213bdf.zip
Merge remote-tracking branch 'origin/pr/5457' into dev
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci.yml10
1 files changed, 7 insertions, 3 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ccb29d100..3476f2abc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,7 +62,7 @@ jobs:
python -m pip install -U pip
python -m pip install -U -r misc/requirements/requirements-tox.txt
- name: "Run ${{ matrix.testenv }}"
- run: "tox -e ${{ matrix.testenv}} -- ${{ matrix.args }}"
+ run: "dbus-run-session -- tox -e ${{ matrix.testenv}} -- ${{ matrix.args }}"
tests-docker:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
@@ -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 py
+ - run: dbus-run-session tox -e py
tests:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
@@ -164,7 +164,11 @@ jobs:
python -m pip install -U pip
python -m pip install -U -r misc/requirements/requirements-tox.txt
- name: "Run ${{ matrix.testenv }}"
- run: "tox -e ${{ matrix.testenv}} -- ${{ matrix.args }}"
+ run: "dbus-run-session -- tox -e ${{ matrix.testenv }} -- ${{ matrix.args }}"
+ if: "startsWith(matrix.os, 'ubuntu-')"
+ - name: "Run ${{ matrix.testenv }}"
+ run: "tox -e ${{ matrix.testenv }} -- ${{ matrix.args }}"
+ if: "!startsWith(matrix.os, 'ubuntu-')"
- name: Analyze backtraces
run: "bash scripts/dev/ci/backtrace.sh ${{ matrix.testenv }}"
if: "failure()"