Merge branch 'master' into release/0.4.0

CSVD · Aug 27, 2019 · 3b1ed68 · 3b1ed68
2 parents 0d0bc64 + 8f38c19
commit 3b1ed68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -125,7 +125,6 @@ jobs:
             docker cp tests/ dummy:/work/tests/
             docker cp ./splunk/etc/* dummy:/work/splunk-etc/
             docker rm dummy
-
       - run:
           name: Docker Compose build
           command: |
@@ -289,9 +288,8 @@ workflows:
                 - develop
       - publish-version:
           requires:
-            - build
-#            - dgoss
-#            - test-unit
+            - dgoss
+            - test-unit
           filters:
             branches:
               only:

diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -94,4 +94,4 @@ volumes:
   sc4s-results:
     external: true
   splunk-etc:
-    external: true
+    external: true