ci: Finish partial move to GitHub actions

3 files changed, 11 insertions, 88 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e8519557..93249ed70 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,6 @@ on: [push, pull_request]
 
 jobs:
   linters:
-    if: false  # FIXME
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -36,7 +35,6 @@ jobs:
         run: "bash scripts/dev/ci/run.sh ${{ matrix.testenv }}"
 
   tests-docker:
-    if: false  # FIXME
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
@@ -63,9 +61,10 @@ jobs:
       matrix:
         include:
           ### PyQt 5.7.1 (Python 3.5)
-          - testenv: py35-pyqt57
-            os: ubuntu-16.04
-            python: 3.5
+          # FIXME: Flaky tests / segfault on exit?
+          # - testenv: py35-pyqt57
+          #   os: ubuntu-16.04
+          #   python: 3.5
           ### PyQt 5.9 (Python 3.6)
           - testenv: py36-pyqt59
             os: ubuntu-20.04
@@ -75,9 +74,10 @@ jobs:
             os: ubuntu-20.04
             python: 3.6
           ### PyQt 5.11 (Python 3.7)
-          - testenv: py37-pyqt511
-            os: ubuntu-20.04
-            python: 3.7
+          # FIXME: seccomp-bpf failure in syscall 0230
+          # - testenv: py37-pyqt511
+          #   os: ubuntu-20.04
+          #   python: 3.7
           ### PyQt 5.12 (Python 3.8)
           - testenv: py38-pyqt512
             os: ubuntu-20.04
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5de8a8726..1df39d8cc 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -23,7 +23,7 @@ jobs:
     # the head of the pull request instead of the merge commit.
     - run: git checkout HEAD^2
       if: ${{ github.event_name == 'pull_request' }}
-      
+
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:
diff --git a/.travis.yml b/.travis.yml
index 28ad24af9..5a521cd42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,64 +6,16 @@ os: linux
 
 matrix:
   fast_finish: true
-  # allow_failures:
-  #   - env: DOCKER=archlinux-webengine-unstable QUTE_BDD_WEBENGINE=true
-  #     services: docker
   include:
-    ### Archlinux QtWebKit
-    - env: DOCKER=archlinux-webkit
-      services: docker
-
-    ### Archlinux QtWebEngine
-    - env: DOCKER=archlinux-webengine QUTE_BDD_WEBENGINE=true
-      services: docker
-
-    ### Archlinux QtWebEngine with testing/KDE-Unstable
-    - env: DOCKER=archlinux-webengine-unstable QUTE_BDD_WEBENGINE=true
-      services: docker
-
     ### PyQt 5.7.1 (Python 3.5)
     - python: 3.5
       env: TESTENV=py35-pyqt57
       dist: xenial
 
-    ### PyQt 5.9 (Python 3.6)
-    - python: 3.6
-      env: TESTENV=py36-pyqt59
-
-    ### PyQt 5.10 (Python 3.6)
-    - python: 3.6
-      env: TESTENV=py36-pyqt510
-      addons:
-        apt:
-          packages:
-          - xfonts-base
-
     ### PyQt 5.11 (Python 3.7)
     - python: 3.7
       env: TESTENV=py37-pyqt511
 
-    ### PyQt 5.12 (Python 3.8)
-    - env: TESTENV=py38-pyqt512
-      addons:
-        apt:
-          packages:
-          - libxkbcommon-x11-0
-
-    ### PyQt 5.13 (Python 3.8)
-    - env: TESTENV=py38-pyqt513
-      addons:
-        apt:
-          packages:
-          - libxkbcommon-x11-0
-
-    ### PyQt 5.14 (Python 3.8)
-    - env: TESTENV=py38-pyqt514
-      addons:
-        apt:
-          packages:
-          - libxkbcommon-x11-0
-
     ### PyQt 5.15 (Python 3.8, with coverage)
     - env: TESTENV=py38-pyqt515-cov
       addons:
@@ -91,46 +43,17 @@ matrix:
       language: generic
       python: 3.7
 
-    ### pylint/flake8/mypy
-    - env: TESTENV=pylint
-    - env: TESTENV=flake8
-    - env: TESTENV=mypy
-
-    ### docs
-    - env: TESTENV=docs
-      addons:
-         apt:
-           packages:
-           - asciidoc
-
-    ### vulture/misc/pyroma/check-manifest
-    - env: TESTENV=vulture
-    - env: TESTENV=misc
-    - env: TESTENV=pyroma
-    - env: TESTENV=check-manifest
-
-    ### eslint
-    - env: TESTENV=eslint
-      language: node_js
-      python: null
-      node_js: "lts/*"
-
-    ### shellcheck
-    - language: generic
-      env: TESTENV=shellcheck
-      services: docker
-
 cache:
   directories:
     - $HOME/.cache/pip
     - $HOME/build/qutebrowser/qutebrowser/.cache
 
 install:
-  - bash scripts/dev/ci/travis_install.sh
+  - bash scripts/dev/ci/install.sh "$TESTENV"
   - ulimit -c unlimited
 
 script:
-  - bash scripts/dev/ci/travis_run.sh
+  - bash scripts/dev/ci/run.sh "$TESTENV"
 
 after_success:
   - '[[ $TESTENV == *-cov ]] && codecov -e TESTENV -X gcov'