X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=.gitlab-ci.yml;h=ad63ee2b930e8adb55be3d3727d41d721c203e19;hb=1a178217e8efd3b2b523afb93775124baf1be05f;hp=8379c87799f6f7d06aadf0ccdde9ee8fd26ea884;hpb=dd2a18ade8d2cdbd3111c4eb01cf95f4a631f8a7;p=mpd-sima.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8379c87..ad63ee2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,11 +5,13 @@ image: python:3
 include:
   - local: .gitlab/gitlab-templates.yml
   - local: .gitlab/pylint.yml
-  - template: Security/SAST.gitlab-ci.yml
+  - template: Jobs/SAST.gitlab-ci.yml
 
 variables:
   #XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache"
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache"
+  SAST_EXCLUDED_ANALYZERS: brakeman, flawfinder, kubesec, mobsf, nodejs-scan,
+    phpcs-security-audit, pmd-apex, sobelow, spotbugs
 
 cache:
   paths:
@@ -27,44 +29,35 @@ smoketest:
   # build wheel and source
   - python setup.py bdist_wheel sdist
   # manual and HTML documentation
-  - python setup.py build_sphinx
+  - sphinx-build -d ./build/doctrees doc/source -b man ./build/man/
+  - sphinx-build -d ./build/doctrees doc/source -b html ./build/html/
   # install
   - pip install dist/*.whl
   # smoke test
   - mpd-sima --help
+  - TRACE=y ./mpd-sima -d --pid ./mpd-sima.pid -l ./mpd-sima.log
+  - sleep 10
+  - test -f ./mpd-sima.pid && kill $(cat ./mpd-sima.pid)
   artifacts:
     expire_in: 1 hour
     paths:
     - dist/*.whl
     - dist/*.tar.gz
     - dist/*.zip
+    - ./mpd-sima.pid
+    - ./mpd-sima.log
 
 unittests:
   stage: test
   script:
   - pip install pytest-cov requests python-musicpd
   - py.test -q --cov=sima --junitxml=report.xml tests
+  coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
   artifacts:
     when: always
     reports:
       junit: report.xml
 
-vinstall:
-  stage: test
-  script:
-  # test virtualenv install
-  - python3 ./vinstall.py
-  # smoke test
-  - ./vmpd-sima --help
-  artifacts:
-    expire_in: 1 hour
-
-sast:
-  variables:
-    SAST_EXCLUDED_ANALYZERS: brakeman, eslint, flawfinder, gosec, kubesec, nodejs-scan,
-      phpcs-security-audit, pmd-apex, security-code-scan, semgrep, sobelow, spotbugs
-  stage: test
-
 tag_release:
   stage: build
   dependencies: