From bd986728790c1aca7ed49a2078ee712cec6ec16a Mon Sep 17 00:00:00 2001
From: Brandon Ringe <brandon.ringe@gmail.com>
Date: Wed, 10 Feb 2021 15:12:10 -0800
Subject: [PATCH] Update ci config

---
 .circleci/config.yml | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 21894a7a7..7deff578a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -305,24 +305,22 @@ workflows:
   # We have two workflows, because for some reason the tag filter need to be on all jobs...
   build-test:
     jobs:
-      # - build:
-      #     filters:
-      #       tags:
-      #         ignore: /^v\d+\.\d+\.\d+-?.*/
-      # - test-grammar:
-      #     requires:
-      #       - build
-      # - test-cljslib:
-      #     requires:
-      #       - build
-      # - test-integration:
-      #     requires:
-      #       - build
-      # - test-ts-unit:
-      #     requires:
-      #       - build
-      - merge-dev-to-published:
-          context: Calva
+      - build:
+          filters:
+            tags:
+              ignore: /^v\d+\.\d+\.\d+-?.*/
+      - test-grammar:
+          requires:
+            - build
+      - test-cljslib:
+          requires:
+            - build
+      - test-integration:
+          requires:
+            - build
+      - test-ts-unit:
+          requires:
+            - build
   release-publish:
     jobs:
       - build: