diff options
author | Lars Wirzenius <liw@liw.fi> | 2019-06-28 08:00:28 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2019-07-05 20:59:10 +0300 |
commit | 1fc41ad97411b435c512ba3a0de63929eda9c33d (patch) | |
tree | 753b342e70c5ac2bf64eb619e95f815d47588e0b /check | |
parent | 1c6d50edf9041055f4804a1ba21a4fc5499bb0a9 (diff) | |
download | ick2-1fc41ad97411b435c512ba3a0de63929eda9c33d.tar.gz |
Change: make yarns run against a remote Ick instance, not local
Diffstat (limited to 'check')
-rwxr-xr-x | check | 72 |
1 files changed, 23 insertions, 49 deletions
@@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2017-2018 Lars Wirzenius +# Copyright 2017-2019 Lars Wirzenius # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -30,32 +30,16 @@ title() } -title Remote or local yarns? -remote=no -unit=yes -yarns=yes +title Remote yarns? +yarns=no if [ "$#" -gt 0 ] then case "$1" in https://*) - remote=yes - unit=no yarns=yes remote_url="$1" shift 1 ;; - yarns) - remote=no - unit=no - yarns=yes - shift 1 - ;; - local) - remote=no - unit=yes - yarns=no - shift 1 - ;; *) echo "Don't understand args: $@" 1>&2 exit 1 @@ -64,51 +48,41 @@ then fi -if [ "$unit" = yes ] -then - title Unit tests - python3 -m CoverageTestRunner --ignore-missing-from=without-tests ick2 +title Unit tests +python3 -m CoverageTestRunner --ignore-missing-from=without-tests ick2 - if [ -e .git ] - then - sources="$(git ls-files | grep -Fvxf copyright-exceptions)" +if [ -e .git ] +then + sources="$(git ls-files | grep -Fvxf copyright-exceptions)" - title Copyright statements - copyright-statement-lint $sources + title Copyright statements + copyright-statement-lint $sources - title Copyright licences - ./is-agpl3+ $sources - fi + title Copyright licences + ./is-agpl3+ $sources +fi - python_sources="ick_controller.py worker_manager ick2 icktool" +python_sources="ick_controller.py worker_manager ick2 icktool" - title pycodestyle - pycodestyle ick2 $python_sources +title pycodestyle +pycodestyle ick2 $python_sources - if command -v pylint3 > /dev/null - then - title pylint3 - pylint3 --rcfile pylint.conf $python_sources - fi +if command -v pylint3 > /dev/null +then + title pylint3 + pylint3 --rcfile pylint.conf $python_sources fi if [ "$yarns" = yes ] then title Yarns - if [ "$remote" = no ] - then - impl=yarns/900-local.yarn - args="" - else - impl=yarns/900-remote.yarn - args="--env ICK_URL=$remote_url" - fi - yarn yarns/[^9]*.yarn yarns/900-implements.yarn "$impl" \ + yarn yarns/*.yarn \ --shell python2 \ --shell-arg '' \ --shell-library yarns/lib.py \ --cd-datadir \ - $args \ + --env "CONTROLLER=$remote_url" \ + --env "SECRETS=$HOME/.config/qvarn/createtoken.conf" \ "$@" fi |