diff options
Diffstat (limited to '.github/workflows/ci.yml')
| -rw-r--r-- | .github/workflows/ci.yml | 67 |
1 files changed, 34 insertions, 33 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64dddd2f8..fe1bbefe7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,8 +33,9 @@ jobs: args: "-f gcc" # For problem matchers - testenv: yamllint - testenv: actionlint + - testenv: package steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - uses: actions/cache@v3 @@ -44,10 +45,10 @@ jobs: .tox ~/.cache/pip key: "${{ matrix.testenv }}-${{ hashFiles('misc/requirements/requirements-*.txt') }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('scripts/dev/pylint_checkers/qute_pylint/*.py') }}" - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.10' - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: '16.x' if: "matrix.testenv == 'eslint'" @@ -56,7 +57,8 @@ jobs: - name: Install dependencies run: | [[ ${{ matrix.testenv }} == eslint ]] && npm install -g eslint - [[ ${{ matrix.testenv }} == docs ]] && sudo apt-get update && sudo apt-get install --no-install-recommends asciidoc + [[ ${{ matrix.testenv }} == docs ]] && sudo apt-get update && sudo apt-get install --no-install-recommends asciidoc libegl1-mesa + [[ ${{ matrix.testenv }} == vulture || ${{ matrix.testenv }} == pylint ]] && sudo apt-get update && sudo apt-get install --no-install-recommends libegl1-mesa if [[ ${{ matrix.testenv }} == shellcheck ]]; then scversion="stable" bindir="$HOME/.local/bin" @@ -89,17 +91,16 @@ jobs: fail-fast: false matrix: include: - - testenv: py + - testenv: py-qt5 image: archlinux-webkit - - testenv: py + - testenv: py-qt5 image: archlinux-webengine - - testenv: py-qt6 + - testenv: py-qt5 + image: archlinux-webengine-unstable + - testenv: py image: archlinux-webengine-qt6 - testenv: py - image: archlinux-webengine-unstable - args: "" - # - testenv: py - # image: archlinux-webengine-unstable-qt6 # FIXME:qt6.5 activate + image: archlinux-webengine-unstable-qt6 container: image: "qutebrowser/ci:${{ matrix.image }}" env: @@ -111,13 +112,13 @@ jobs: - /home/runner/work/_temp/:/home/runner/work/_temp/ options: --privileged --tty steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - name: Set up problem matchers - run: "python scripts/dev/ci/problemmatchers.py py38 ${{ runner.temp }}" + run: "python scripts/dev/ci/problemmatchers.py tests ${{ runner.temp }}" - name: Run tox - run: "dbus-run-session -- tox -e ${{ matrix.testenv }} -- ${{ matrix.args }}" + run: "dbus-run-session -- tox -e ${{ matrix.testenv }}" tests: if: "!contains(github.event.head_commit.message, '[ci skip]')" @@ -156,31 +157,31 @@ jobs: - testenv: py310-pyqt65 os: ubuntu-22.04 python: "3.10" - ### PyQt 6.5 (Python 3.11) - - testenv: py311-pyqt65 + ### PyQt 6.6 (Python 3.11) + - testenv: py311-pyqt66 os: ubuntu-22.04 python: "3.11" - ### PyQt 6.5 (Python 3.12) - # - testenv: py312-pyqt65 - # os: ubuntu-22.04 - # python: "3.12-dev" - ### macOS Big Sur: PyQt 5.15 (Python 3.9 to match PyInstaller env) - - testenv: py39-pyqt515 + ### PyQt 6.6 (Python 3.12) + - testenv: py312-pyqt66 + os: ubuntu-22.04 + python: "3.12" + ### macOS Big Sur + - testenv: py312-pyqt66 os: macos-11 - python: "3.9" + python: "3.12" args: "tests/unit" # Only run unit tests on macOS ### macOS Monterey - - testenv: py39-pyqt515 + - testenv: py312-pyqt66 os: macos-12 - python: "3.9" + python: "3.12" args: "tests/unit" # Only run unit tests on macOS - ### Windows: PyQt 5.15 (Python 3.9 to match PyInstaller env) - - testenv: py39-pyqt515 + ### Windows + - testenv: py312-pyqt66 os: windows-2019 - python: "3.9" + python: "3.12" runs-on: "${{ matrix.os }}" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - uses: actions/cache@v3 @@ -191,7 +192,7 @@ jobs: ~/.cache/pip key: "${{ matrix.testenv }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('misc/requirements/requirements-*.txt') }}-${{ hashFiles('requirements.txt') }}" - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "${{ matrix.python }}" - name: Set up problem matchers @@ -228,16 +229,16 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: javascript, python queries: +security-extended - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 irc: timeout-minutes: 2 |