Merge branch 'feature/event_driven_updates' into develop

2020-09-03 15:59:19 +02:00
parent f2da4cb8e9 4b07ae0cc3
commit b3230177d8
7 changed files with 115 additions and 38 deletions
--- a/.gitlab/ci/build.gitlab-ci.yml
+++ b/.gitlab/ci/build.gitlab-ci.yml
@ -8,5 +8,8 @@ build:
    name: multi_user
    paths: 
     - multi_user
-
+  only:
+    refs:
+    - master
+    - develop

--- a/.gitlab/ci/test.gitlab-ci.yml
+++ b/.gitlab/ci/test.gitlab-ci.yml
@ -11,4 +11,7 @@ test:
    - python -m pip install blender-addon-tester
    - python scripts/test_addon.py

-
+  only:
+    refs:
+    - master
+    - develop