Merge remote-tracking branch 'origin' into jrm/clean-mesh

ci: Activated both mac runs on build

.circleci/config.yml

@@ -120,7 +120,7 @@ jobs:
       - when:
           condition:
             and:
-              - << parameters.installer >>
+              # - << parameters.installer >>
               - equal: [osx-x64, << parameters.runtime >>]
           steps:
             - run:
@@ -233,6 +233,7 @@ workflows:
                 - main
                 - /ci\/.*/
       - build-connector-win:
+          name: Windows Build
           requires:
             - get-ci-tools
           filters:
@@ -241,14 +242,17 @@ workflows:
                 - main
                 - /ci\/.*/
       - build-connector-mac:
+          name: Mac ARM Build
+          slug: blender-mac-arm
+          runtime: osx-arm64
+          requires:
+            - get-ci-tools
+      - build-connector-mac:
+          name: Mac Intel Build
+          slug: blender-mac-intel
+          runtime: osx-x64
           requires:
             - get-ci-tools
-          filters:
-            branches:
-              only:
-                - main
-                - /ci\/.*/
-
   deploy: # build installers and deploy
     jobs:
       - get-ci-tools:
@@ -259,7 +263,7 @@ workflows:
               ignore: /.*/
 
       - build-connector-win:
-          name: build-deploy-connector-win
+          name: Windows Build&Deploy
           slug: blender
           installer: true
           requires:
@@ -270,36 +274,38 @@ workflows:
             branches:
               ignore: /.*/
 
-      # - build-connector-mac:
-      #     name: build-deploy-connector-mac-arm
-      #     slug: blender-mac-arm
-      #     runtime: osx-arm64
-      #     installer: true
-      #     requires:
-      #       - get-ci-tools
-      #     filters:
-      #       tags:
-      #         only: /^(all|mac)\/([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
-      #       branches:
-      #         ignore: /.*/
+      - build-connector-mac:
+          name: Mac ARM Build&Deploy
+          slug: blender-mac-arm
+          runtime: osx-arm64
+          installer: true
+          requires:
+            - get-ci-tools
+          filters:
+            tags:
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+            branches:
+              ignore: /.*/
 
-      # - build-connector-mac:
-      #     name: build-deploy-connector-mac-intel
-      #     slug: blender-mac-intel
-      #     runtime: osx-x64
-      #     installer: true
-      #     requires:
-      #       - get-ci-tools
-      #     filters:
-      #       tags:
-      #         only: /^(all|mac)\/([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
-      #       branches:
-      #         ignore: /.*/
+      - build-connector-mac:
+          name: Mac Intel Build&Deploy
+          slug: blender-mac-intel
+          runtime: osx-x64
+          installer: true
+          requires:
+            - get-ci-tools
+          filters:
+            tags:
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+            branches:
+              ignore: /.*/
 
       - deploy:
           requires:
             - get-ci-tools
-            - build-deploy-connector-win
+            - Windows Build&Deploy
+            - Mac ARM Build&Deploy
+            - Mac Intel Build&Deploy
           filters:
             tags:
               only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
@@ -311,7 +317,6 @@ workflows:
           os: Win
           extension: exe
           requires:
-            - get-ci-tools
             - deploy
           filters:
             tags: