From d6618c75a014084ae1411bae12c47cf361fcd78a Mon Sep 17 00:00:00 2001
From: Travis Person <travisperson@users.noreply.github.com>
Date: Mon, 2 May 2022 20:18:31 +0000
Subject: [PATCH 1/2] ci: deps: remove install-deps for macos builds

---
 .circleci/config.yml   | 1 -
 .circleci/template.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index acda4b9e4..20c82aea0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -388,7 +388,6 @@ jobs:
       - restore_cache:
           name: restore cargo cache
           key: v3-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.sum" }}
-      - install-deps
       - run:
           command: make build
           no_output_timeout: 30m
diff --git a/.circleci/template.yml b/.circleci/template.yml
index 2033d2169..f2fa1c080 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -388,7 +388,6 @@ jobs:
       - restore_cache:
           name: restore cargo cache
           key: v3-go-deps-{{ arch }}-{{ checksum "~/go/src/github.com/filecoin-project/lotus/go.sum" }}
-      - install-deps
       - run:
           command: make build
           no_output_timeout: 30m

From 415b506a859ea5b3b6dab64bc112781e20ad8b8c Mon Sep 17 00:00:00 2001
From: Travis Person <travisperson@users.noreply.github.com>
Date: Mon, 2 May 2022 20:36:13 +0000
Subject: [PATCH 2/2] ci: build-all and build-macos on all ci runs

---
 .circleci/config.yml   | 15 ++-------------
 .circleci/template.yml | 15 ++-------------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 20c82aea0..0e0ea5adc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1000,11 +1000,7 @@ workflows:
               only:
                 - master
       - build-debug
-      - build-all:
-          filters:
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-all
       - build-ntwk-calibration:
           filters:
             tags:
@@ -1016,14 +1012,7 @@ workflows:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
       - build-lotus-soup
-      - build-macos:
-          filters:
-            branches:
-              ignore:
-                - /.*/
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-macos
       - build-appimage:
           filters:
             branches:
diff --git a/.circleci/template.yml b/.circleci/template.yml
index f2fa1c080..cd846ee45 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -800,11 +800,7 @@ workflows:
               only:
                 - master
       - build-debug
-      - build-all:
-          filters:
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-all
       - build-ntwk-calibration:
           filters:
             tags:
@@ -816,14 +812,7 @@ workflows:
               only:
                 - /^v\d+\.\d+\.\d+(-rc\d+)?$/
       - build-lotus-soup
-      - build-macos:
-          filters:
-            branches:
-              ignore:
-                - /.*/
-            tags:
-              only:
-                - /^v\d+\.\d+\.\d+(-rc\d+)?$/
+      - build-macos
       - build-appimage:
           filters:
             branches: