diff options
| author | Frederick Muriuki Muriithi | 2022-01-21 10:31:13 +0300 |
|---|---|---|
| committer | Frederick Muriuki Muriithi | 2022-01-24 10:25:27 +0300 |
| commit | 78d0d84fd7300e934ca76fa6faa38536b8028125 (patch) | |
| tree | 77ae7f2d75869df7899b5dc5c9aa2af27ef2b7ce | |
| parent | 4c909d6748ef1f0e7348f7aec42a903f83c6f564 (diff) | |
| download | genenetwork3-78d0d84fd7300e934ca76fa6faa38536b8028125.tar.gz | |
Use guix shell. Remove git commandsci-cd-scripts
* Use guix shell rather than guix environment
* Use `GN_CI_DIR` set up at invocation
* Remove git commands
* Use `~/.config/guix/current/bin/guix` to take advantage of declared channels
| -rwxr-xr-x | scripts/laminar/gn3-lint.run | 10 | ||||
| -rwxr-xr-x | scripts/laminar/gn3-mypy.run | 11 | ||||
| -rwxr-xr-x | scripts/laminar/gn3-unittest.run | 11 |
3 files changed, 11 insertions, 21 deletions
diff --git a/scripts/laminar/gn3-lint.run b/scripts/laminar/gn3-lint.run index 2456740..edf37af 100755 --- a/scripts/laminar/gn3-lint.run +++ b/scripts/laminar/gn3-lint.run @@ -3,14 +3,10 @@ set -ex # Abort on first error CUR_DIR=$PWD -GN3_CI_DIR=$HOME/CI/genenetwork3/ - -cd $GN3_CI_DIR -git pull +cd "$GN3_CI_DIR" # Run Pylint -env GUIX_PACKAGE_PATH="$HOME/guix-bioinformatics:$HOME/guix-past/modules" \ - guix environment --load=guix.scm -- pylint sheepdog/worker.py gn3/ tests +"${HOME}/.config/guix/current/bin/guix" shell --file=guix.scm -- pylint sheepdog/worker.py gn3/ tests echo Done Running Pylint! -cd $CUR_DIR +cd "$CUR_DIR" diff --git a/scripts/laminar/gn3-mypy.run b/scripts/laminar/gn3-mypy.run index 43f48e8..f92981b 100755 --- a/scripts/laminar/gn3-mypy.run +++ b/scripts/laminar/gn3-mypy.run @@ -1,15 +1,12 @@ #!/bin/sh set -ex # Abort on first error -CUR_DIR=$PWD -GN3_CI_DIR=$HOME/CI/genenetwork3/ -cd $GN3_CI_DIR -git pull +CUR_DIR=$PWD +cd "$GN3_CI_DIR" # Run Pylint -env GUIX_PACKAGE_PATH="$HOME/guix-bioinformatics:$HOME/guix-past/modules" \ - guix environment --load=guix.scm -- mypy . +"${HOME}/.config/guix/current/bin/guix" shell --file=guix.scm -- mypy . echo Done Running MyPy! -cd $CUR_DIR +cd "$CUR_DIR" diff --git a/scripts/laminar/gn3-unittest.run b/scripts/laminar/gn3-unittest.run index e6a65e5..4e0dc64 100755 --- a/scripts/laminar/gn3-unittest.run +++ b/scripts/laminar/gn3-unittest.run @@ -1,15 +1,12 @@ #!/bin/sh set -ex # Abort on first error -CUR_DIR=$PWD -GN3_CI_DIR=$HOME/CI/genenetwork3/ -cd $GN3_CI_DIR -git pull +CUR_DIR=$PWD +cd "$GN3_CI_DIR" # Run Pylint -env GUIX_PACKAGE_PATH="$HOME/guix-bioinformatics:$HOME/guix-past/modules" \ - guix environment --load=guix.scm -- python -m unittest discover +"${HOME}/.config/guix/current/bin/guix" shell --file=guix.scm -- python -m unittest discover tests.unit echo Done Running Unittests! -cd $CUR_DIR +cd "$CUR_DIR" |