diff options
| -rw-r--r-- | scripts/dev/ci/install.sh | 30 | ||||
| -rw-r--r-- | scripts/dev/ci/run.sh | 5 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 10 insertions, 27 deletions
diff --git a/scripts/dev/ci/install.sh b/scripts/dev/ci/install.sh index 7c7831a7e..2f7f15984 100644 --- a/scripts/dev/ci/install.sh +++ b/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 diff --git a/scripts/dev/ci/run.sh b/scripts/dev/ci/run.sh index 379ef279c..ff1cdd0d7 100644 --- a/scripts/dev/ci/run.sh +++ b/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" @@ -180,8 +180,6 @@ deps = {[testenv:pyinstaller]deps} commands = {[testenv:pyinstaller]commands} [testenv:eslint] -# This is duplicated in travis_run.sh for Travis CI because we can't get tox in -# the JavaScript environment easily. basepython = python3 deps = passenv = TERM |