ci: change shell

ci: adds signtool param
Merge remote-tracking branch 'origin' into jrm/clean-mesh
2022-09-27 10:15:58 +01:00 · 2022-09-27 10:07:01 +01:00 · 2022-09-23 13:58:07 +01:00 · 2022-09-23 14:56:02 +02:00 · 2022-09-23 14:28:51 +02:00 · 2022-09-23 14:27:50 +02:00
1 changed files with 41 additions and 36 deletions
@@ -57,7 +57,7 @@ jobs:
          python-version: "3.10.2"
      - run:
          name: Patch
-          shell: powershell.exe
+          shell: cmd.exe #does not work in powershell
          command:
            | # If no tag, use 0.0.0.1 and don't make any YML (for testing only!)
            $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "0.0.0" } else { $env:CIRCLE_TAG }
@@ -68,7 +68,7 @@ jobs:
            New-Item -Force "speckle-sharp-ci-tools/Installers/blender/$channel.yml" -ItemType File -Value "version: $semver"
            echo $semver
            python patch_version.py $semver
-            speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\blender.iss
+            speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\blender.iss /Sbyparam=$p
      - when:
          condition: << parameters.installer >>
          steps:
@@ -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:
Author	SHA1	Message	Date
Matteo Cominetti	74cb3e5f85	ci: change shell	2022-09-27 10:15:58 +01:00
Matteo Cominetti	326f04f67d	ci: adds signtool param	2022-09-27 10:07:01 +01:00
JR-Morgan	68972ba8f9	Merge remote-tracking branch 'origin' into jrm/clean-mesh	2022-09-23 13:58:07 +01:00
Alan Rynne	73a028b56f	Merge pull request #112 from specklesystems/ci/force-run ci: Activated both mac runs on build	2022-09-23 14:56:02 +02:00
Alan Rynne	33890ef0ee	fix: went too far	2022-09-23 14:28:51 +02:00
Alan Rynne	53fe676ab6	ci: Prettified steps	2022-09-23 14:27:50 +02:00
Alan Rynne	f027c7eca4	ci: Activated both mac runs on build	2022-09-23 14:11:19 +02:00