From 00c95cfaf0dfaa59b937017c966ef1ccf2afc96d Mon Sep 17 00:00:00 2001
From: Sven Marcus <s.marcus@outlook.de>
Date: Tue, 10 Nov 2020 11:48:55 +0100
Subject: [PATCH] Switch to building & installing wheel. VF unit tests without
 python

---
 .gitlab-ci.yml | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e674b1648..b8a5b5cfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,21 +15,16 @@ gcc_9_python:
   stage: build
 
   cache:
-    key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
+    key: "Python-GCC9-$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
     paths:
-      - _skbuild
+      - build
 
   artifacts:
     paths:
-      - _skbuild/
-      - Python/venv
-
-  before_script:
-    - python3 -m venv --system-site-packages Python/venv
-    - source Python/venv/bin/activate
+      - dist/
 
   script:
-    - python3 setup.py install
+    - python3 setup.py bdist_wheel
 
 gcc_9:
   stage: build
@@ -191,13 +186,13 @@ gcc_9_rebuild:
 ###############################################################################
 ##                                Tests                                      ##
 ###############################################################################
-gcc_9_python_unit_tests:
+gcc_9_unit_tests:
   stage: test
 
-  needs: ["gcc_9_python"]
+  needs: ["gcc_9"]
 
   before_script:
-    - export VF_UNITTESTS=$(find _skbuild -name basicsTests)
+    - export VF_UNITTESTS=$(find build_gcc9 -name basicsTests)
 
   script:
     - $VF_UNITTESTS
@@ -222,14 +217,10 @@ gcc_9_python_bindings_test:
 
   needs: ["gcc_9_python"]
 
-  artifacts:
-    when: on_failure
-    paths:
-      - output/mq/mq10000/
-
   before_script:
     - export PYTHONPATH="Python"
-    - source Python/venv/bin/activate
+    - export VF_WHEEL=$(find -f dist/*.whl)
+    - pip3 install $VF_WHEEL
 
   script:
     - python3 -m unittest discover -s Python -v
-- 
GitLab