whew

whisk-ml · May 9, 2020 · 4482611 · 4482611
1 parent a74fa2b
commit 4482611
Showing 1 changed file with 4 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,30 +41,17 @@ jobs:
             path: test_results
 workflows:
   version: 2
-  untagged-build:
+  build_and_deploy:
     jobs:
       - test:
-          context: whisk
-          filters:
-            tags:
-              ignore: /.*/
-  tagged-build:
-    # CircleCI does not run workflows for tags unless you explicitly specify tag filters.
-    # Additionally, if a job requires any other jobs (directly or indirectly),
-    # you must use regular expressions to specify tag filters for those jobs.
-    # https://circleci.com/docs/2.0/workflows/#executing-workflows-for-a-git-tag
-    jobs:
-      - test:
-          context: whisk
           filters:
             tags:
               only: /.*/
-            branches:
-              ignore: /.*/
       - deploy:
-          context: whisk
           requires:
             - test
           filters:
             tags:
-              only: /^v[0-9]+.*/
+              only: /^v[0-9]+(\.[0-9]+)*/
+            branches:
+              ignore: /.*/