From 3080383dc459714d594bd89cc51594f6f02bcac0 Mon Sep 17 00:00:00 2001
From: John Kirkham <kirkhamj@janelia.hhmi.org>
Date: Fri, 16 Jun 2017 21:57:17 -0400
Subject: [PATCH 1/3] NO MRG, TST: Re-render with CircleCI 2.0 support

Please do **not** merge this PR. It is for testing purposes only.

Made changes to `conda-smithy` to try and support CircleCI 2.0's format
and layout. This should make it easier to explore parallel matrix builds
in the future as well.
---
 .circleci/config.yml | 23 +++++++++++++++++++++++
 circle.yml           |  9 ---------
 2 files changed, 23 insertions(+), 9 deletions(-)
 create mode 100644 .circleci/config.yml
 delete mode 100644 circle.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..b51a499
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,23 @@
+version: 2
+
+jobs:
+  build:
+    working_directory: ~/test
+    machine: true
+    branches:
+      ignore:
+        - /.*/
+    steps:
+      - run:
+          # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish.
+          command: exit 0
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build:
+          filters:
+            branches:
+              ignore:
+                - /.*/
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 29350ae..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-general:
-  branches:
-    ignore:
-      - /.*/
-
-test:
-  override:
-    # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish.
-    - exit 0

From cae80c1947eb4d29eb2ab69cd23c19029e56499b Mon Sep 17 00:00:00 2001
From: John Kirkham <kirkhamj@janelia.hhmi.org>
Date: Sat, 17 Jun 2017 20:52:13 -0400
Subject: [PATCH 2/3] Drop branch filter to make sure basics work

In case the filter doesn't work, this is what our file would be down to.
So go ahead and try without the filter to make sure it works.
---
 .circleci/config.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b51a499..a4977a7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,9 +4,6 @@ jobs:
   build:
     working_directory: ~/test
     machine: true
-    branches:
-      ignore:
-        - /.*/
     steps:
       - run:
           # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish.
@@ -16,8 +13,4 @@ workflows:
   version: 2
   build_and_test:
     jobs:
-      - build:
-          filters:
-            branches:
-              ignore:
-                - /.*/
+      - build

From 4253033616d4efb6ef97d34364b46f13d132edf2 Mon Sep 17 00:00:00 2001
From: John Kirkham <kirkhamj@janelia.hhmi.org>
Date: Sat, 17 Jun 2017 20:53:26 -0400
Subject: [PATCH 3/3] Revert "Drop branch filter to make sure basics work"

This reverts commit cae80c1947eb4d29eb2ab69cd23c19029e56499b.
---
 .circleci/config.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a4977a7..b51a499 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,6 +4,9 @@ jobs:
   build:
     working_directory: ~/test
     machine: true
+    branches:
+      ignore:
+        - /.*/
     steps:
       - run:
           # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish.
@@ -13,4 +16,8 @@ workflows:
   version: 2
   build_and_test:
     jobs:
-      - build
+      - build:
+          filters:
+            branches:
+              ignore:
+                - /.*/