From d11748278320e367aa63095d9e2c67a0704e13aa Mon Sep 17 00:00:00 2001
From: Paul Tyng <paul@paultyng.net>
Date: Thu, 3 Sep 2020 16:44:39 -0400
Subject: [PATCH 1/2] Add mac builds, speed up win builds

Closes #65
---
 .circleci/config.yml | 47 +++++++++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cc99fdda..208e5fde 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,20 @@ orbs:
 commands:
   win_install_go:
     steps:
-      - run: choco install golang --version 1.14.6 --yes
+      - run:
+          command: |
+            choco install golang --version 1.14.6 --yes
+            go version
+  macos_install_go:
+    steps:
+      - run:
+          # just latest stable version of Go as a sanity check
+          # version specification would require a brew update probably
+          # so this keeps it faster
+          command: |
+            brew install golang
+            go version
+
   go_build:
     steps:
       - run: go build ./...
@@ -15,19 +28,24 @@ commands:
       - run: go test -v ./...
 
 jobs:
-  winbuild:
-    executor:
-      name: win/default
+  # combined due to slowness of Go install
+  macosbuildtest:
+    macos:
+      xcode: "11.1.0"
     steps:
+      - macos_install_go
       - checkout
-      - win_install_go
       - go_build
-  wintest:
+      - go_test
+    
+  # combined due to slowness of Go install
+  winbuildtest:
     executor:
       name: win/default
     steps:
-      - checkout
       - win_install_go
+      - checkout
+      - go_build
       - go_test
 
   go112_build:
@@ -104,10 +122,8 @@ workflows:
   # TODO: add a `nightly` run for checking against TF master branch using TFEXEC_E2ETEST_VERSIONS
   pr:
     jobs:
-      - winbuild
-      - wintest:
-          requires:
-            - winbuild
+      - winbuildtest
+      - macosbuildtest
 
       # build only for these versions
       - go112_build
@@ -130,10 +146,8 @@ workflows:
             - go115_build
   release:
     jobs:
-      - winbuild
-      - wintest:
-          requires:
-            - winbuild
+      - winbuildtest
+      - macosbuildtest
 
       # build only for these versions
       - go112_build
@@ -175,4 +189,5 @@ workflows:
             - go115_test
             - go115_vet
             - go115_fmt
-            - wintest
+            - winbuildtest
+            - macosbuildtest

From 979e50b4b051ab1e4038d95dc60ddc80c0157237 Mon Sep 17 00:00:00 2001
From: Radek Simko <radek.simko@gmail.com>
Date: Fri, 25 Sep 2020 17:02:37 +0100
Subject: [PATCH 2/2] bump xcode to 12.0.0

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 208e5fde..3edb4303 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,7 +31,7 @@ jobs:
   # combined due to slowness of Go install
   macosbuildtest:
     macos:
-      xcode: "11.1.0"
+      xcode: "12.0.0"
     steps:
       - macos_install_go
       - checkout