Merge branch '317-separate-core-and-default-distribution' of...

Merge branch '317-separate-core-and-default-distribution' of edugit.org:AlekSIS/official/AlekSIS-Core into 317-separate-core-and-default-distribution

ci/build_dist.yml

 build_dist:
   stage: build
   script:
-    - if [ $CI_COMMIT_REF_NAME = master ]; then
-       poetry version $(poetry version | cut -d" " -f2)+$(date +%s).${CI_COMMIT_SHORT_SHA} ;
-      elif [ x$CI_OMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
-       if ! [ "$(poetry version | cut -d" " -f2)" = $CI_COMMIT_REF_NAME ]; then
-        echo "Package version does not match tag. Aborting build of tag!" >/dev/fd/2 ;
-        exit 1 ;
-       fi ;
+    - if ! [ x$CI_COMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
+        poetry version $(poetry version | cut -d" " -f2)+$(date --date=${CI_COMMIT_TIMESTAMP} +%Y%m%d%H%M%S).${CI_COMMIT_SHORT_SHA} ;
       fi
     - tox -e build
   artifacts:
     paths:
       - dist/
-  only:
-    - master
-    - tags

ci/deploy_pypi.yml

 deploy_pypi:
   stage: deploy
   script:
+    - if [ $CI_COMMIT_REF_NAME = master ]; then
+       poetry version $(poetry version | cut -d" " -f2)+$(date --date=${CI_COMMIT_TIMESTAMP} +%Y%m%d%H%M%S).${CI_COMMIT_SHORT_SHA} ;
+      elif [ x$CI_COMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
+       if ! [ "$(poetry version | cut -d" " -f2)" = $CI_COMMIT_REF_NAME ]; then
+        echo "Package version does not match tag. Aborting build of tag!" >/dev/fd/2 ;
+        exit 1 ;
+       fi ;
+      fi
     - if [ $CI_COMMIT_REF_NAME = master ]; then
        poetry publish -r gitlab ;
-      elif [ x$CI_OMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
+      elif [ x$CI_COMMIT_REF_NAME = x$CI_COMMIT_TAG ]; then
        poetry publish ;
       fi
   only: