Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # .drone.yml
Fix mix editor did not get the materials from the correct location in update mode
2021-12-23 21:04:43 -05:00 · 2021-12-23 21:03:58 -05:00
1 changed files with 4 additions and 8 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -42,8 +42,10 @@ steps:
    settings:
      repo: *docker-registry-repo
    when:
-      branch:
-        - develop
+      branch: develop
+      event:
+        exclude:
+          - pull_request

  - name: containerize-release
    image: plugins/docker
@ -85,9 +87,3 @@ steps:
    when:
      event:
        - tag
-
-trigger:
-  branch:
-    - develop
-  event:
-    - tag
Author	SHA1	Message	Date
FyloZ	af3b8eee8c	Merge remote-tracking branch 'origin/develop' into develop continuous-integration/drone/push Build is passing Details # Conflicts: # .drone.yml	2021-12-23 21:04:43 -05:00
FyloZ	f21157d283	Fix mix editor did not get the materials from the correct location in update mode	2021-12-23 21:03:58 -05:00