Gha eslint

qutebrowser/javascript/caret.js

@@ -721,7 +721,7 @@ window._qutebrowser.caret = (function() {
      * The actual caret element, an absolute-positioned flashing line.
      * @type {Element}
      */
-    CaretBrowsing.caretElement = undefined;
+    CaretBrowsing.caretElement = undefined
 
     /**
      * The x-position of the caret, in absolute pixels.

scripts/dev/ci/install.sh

@@ -24,25 +24,15 @@ pip_install() {
     python3 -m pip install "$@"
 }
 
-if [[ -n $DOCKER ]]; then
-    exit 0
-fi
-
 testenv=$1
 
-case $testenv in
-    eslint)
-        npm install -g eslint
-        ;;
-    shellcheck)
-        ;;
-    *)
-        pip_install -U pip
-        pip_install -U -r misc/requirements/requirements-tox.txt
-        if [[ $testenv == docs ]]; then
-            sudo apt install asciidoc
-        elif [[ $testenv == *-cov ]]; then
-            pip_install -U -r misc/requirements/requirements-codecov.txt
-        fi
-        ;;
-esac
+[[ -n $DOCKER || $testenv == shellcheck ]] && exit 0
+
+[[ $testenv == eslint ]] && npm install -g eslint
+
+pip_install -U pip
+pip_install -U -r misc/requirements/requirements-tox.txt
+
+[[ $testenv == docs ]] && sudo apt install asciidoc
+[[ $testenv == *-cov ]] && pip_install -U -r misc/requirements/requirements-codecov.txt
+exit 0

scripts/dev/ci/run.sh

@@ -29,11 +29,6 @@ if [[ -n $DOCKER ]]; then
            -e "DOCKER=$DOCKER" \
            -e "CI=$CI" \
            "qutebrowser/ci:$DOCKER"
-elif [[ $testenv == eslint ]]; then
-    # Can't run this via tox as we can't easily install tox in the javascript
-    # travis env
-    cd qutebrowser/javascript || exit 1
-    eslint --color --report-unused-disable-directives .
 elif [[ $testenv == shellcheck ]]; then
     script_list=$(mktemp)
     find scripts/dev/ -name '*.sh' > "$script_list"

tox.ini

@@ -184,9 +184,10 @@ commands = {[testenv:pyinstaller]commands}
 # the JavaScript environment easily.
 basepython = python3
 deps =
+passenv = TERM
 whitelist_externals = eslint
 changedir = {toxinidir}/qutebrowser/javascript
-commands = eslint --color --report-unused-disable-directives .
+commands = eslint --report-unused-disable-directives .
 
 [testenv:mypy]
 basepython = {env:PYTHON:python3}