diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-12-13 09:05:32 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-12-13 09:05:32 +0100 |
| commit | b4d32e04f42d0c4994a234105f01aabe0aba6ce0 (patch) | |
| tree | 388355af97e3c41020a1c996bac844dbcf4bae6b /.github | |
| parent | ac761234c9de65bd6b25ae8b2eeae0828c98a99c (diff) | |
| parent | 5afc8a68191160f8d5c74b92874a0032d3c1996e (diff) | |
| download | qutebrowser-b4d32e04f42d0c4994a234105f01aabe0aba6ce0.tar.gz qutebrowser-b4d32e04f42d0c4994a234105f01aabe0aba6ce0.zip | |
Merge branch 'master' into qt6-v2
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/ci.yml | 7 | ||||
| -rw-r--r-- | .github/workflows/nightly.yml | 11 |
2 files changed, 7 insertions, 11 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ae5e95cdf..b4fbf502b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,12 @@ jobs: python -m pip install -U pip python -m pip install -U -r misc/requirements/requirements-tox.txt - name: "Run ${{ matrix.testenv }}" - run: "dbus-run-session -- tox -e ${{ matrix.testenv}} -- ${{ matrix.args }}" + run: | + if [[ -z "${{ matrix.args }}" ]]; then + dbus-run-session -- tox -e ${{ matrix.testenv }} + else + dbus-run-session -- tox -e ${{ matrix.testenv }} -- ${{ matrix.args }} + fi tests-docker: if: "!contains(github.event.head_commit.message, '[ci skip]')" diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5aaafb666..3d046615d 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -75,15 +75,6 @@ jobs: uses: actions/setup-python@v4 with: python-version: "3.10" - - name: Get asciidoc - uses: actions/checkout@v3 - with: - repository: asciidoc-py/asciidoc-py - ref: '9.x' - path: asciidoc - persist-credentials: false - - name: Move asciidoc out of the repo - run: mv asciidoc .. - name: Install dependencies run: | python -m pip install -U pip @@ -93,7 +84,7 @@ jobs: run: | sed -i '' '/.-d., .--debug.,/s/$/ default=True,/' qutebrowser/qutebrowser.py - name: Run tox - run: "tox -e ${{ matrix.toxenv }} -- --asciidoc ../asciidoc/asciidoc.py --gh-token ${{ secrets.GITHUB_TOKEN }} ${{ matrix.args }}" + run: "tox -e ${{ matrix.toxenv }} -- --gh-token ${{ secrets.GITHUB_TOKEN }} ${{ matrix.args }}" - name: Gather info id: info run: | |