fix(ci): soz just me clowning w regex (#108 )

ci: temp remove mac steps and clean tags (#107 )
ci: deploy to manager 2 (#106 )
2022-08-26 12:09:51 +01:00 · 2022-08-26 12:04:14 +01:00 · 2022-08-26 11:47:50 +01:00 · 2022-06-29 17:04:49 +01:00
1 changed files with 92 additions and 38 deletions
@@ -42,7 +42,7 @@ jobs:
    parameters:
      slug:
        type: string
-        default: ""
+        default: "blender"
      installer:
        type: boolean
        default: false
@@ -81,15 +81,15 @@ jobs:
    macos:
      xcode: 12.5.1
    parameters:
-      build-config:
-        type: string
-        default: Release
      slug:
        type: string
        default: "blender-mac"
      installername:
        type: string
        default: "SpeckleBlenderInstall"
+      runtime:
+        type: string
+        default: "osx-x64"
      installer:
        type: boolean
        default: false
@@ -105,11 +105,6 @@ jobs:
      - run:
          name: Install dotnet
          command: curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin
-      - run:
-          name: Install python 3.10
-          command: |
-            brew install python@3.10
-            brew link --overwrite python@3.10
      - run:
          name: Build & Patch Version
          command: |
@@ -121,6 +116,25 @@ jobs:
            mkdir -p speckle-sharp-ci-tools/Installers/<< parameters.slug >>
            if [ "${CIRCLE_TAG}" ]; then echo "version: $SEMVER" > "speckle-sharp-ci-tools/Installers/<< parameters.slug >>/$CHANNEL.yml"; fi
            python3 patch_version.py $SEMVER
+      # update python and package dependencies
+      - when:
+          condition:
+            and:
+              - << parameters.installer >>
+              - equal: [osx-x64, << parameters.runtime >>]
+          steps:
+            - run:
+                name: Install python 3.10
+                command: |
+                  brew install python@3.10
+                  brew link --overwrite python@3.10
+            - run:
+                name: Package specklepy dependencies for blender 3.1 & 3.2
+                command: |
+                  python3 --version
+                  python3 -m pip install --target=./modules-intel-3.10 specklepy==$(python3 -m patch_version)
+                  zip -r modules-intel-3.10.zip modules-intel-3.10/
+                  cp modules-intel-3.10.zip speckle-sharp-ci-tools/Mac/<<parameters.installername>>/.installationFiles
      - run:
          name: Zip Connector files
          command: |
@@ -131,29 +145,23 @@ jobs:
            mkdir -p speckle-sharp-ci-tools/Mac/<<parameters.installername>>/.installationFiles/
            cp << parameters.slug >>.zip speckle-sharp-ci-tools/Mac/<<parameters.installername>>/.installationFiles
            python3 patch_version.py > speckle-sharp-ci-tools/Mac/<<parameters.installername>>/.installationFiles/specklepy_ver.yml
-      - run:
-          name: Package specklepy dependencies for blender 3.1
-          command: |
-            python3 --version
-            python3 -m pip install --target=./modules-intel-3.10 specklepy==$(python3 -m patch_version)
-            zip -r modules-intel-3.10.zip modules-intel-3.10/
-            cp modules-intel-3.10.zip speckle-sharp-ci-tools/Mac/<<parameters.installername>>/.installationFiles/blender-3.1
+
      - run:
          name: Build Mac installer
-          command: ~/.dotnet/dotnet publish speckle-sharp-ci-tools/Mac/<<parameters.installername>>/<<parameters.installername>>.sln -r osx-x64 -c Release
+          command: ~/.dotnet/dotnet publish speckle-sharp-ci-tools/Mac/<<parameters.installername>>/<<parameters.installername>>.sln -r << parameters.runtime >> -c Release
      - run:
          name: Zip installer
          command: |
-            cd speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/
+            cd speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/<< parameters.runtime >>/
            zip -r << parameters.slug >>.zip ./
      - store_artifacts:
-          path: speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/<< parameters.slug >>.zip
+          path: speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/<< parameters.runtime >>/<< parameters.slug >>.zip
      - run:
          name: Copy to installer location
          command: |
            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;)
            SEMVER=$(echo "$TAG" | sed -e 's/[a-zA-Z-]*\///')
-            cp speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/osx-x64/<< parameters.slug >>.zip speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<< parameters.slug >>-$SEMVER.zip
+            cp speckle-sharp-ci-tools/Mac/<<parameters.installername>>/bin/Release/net6.0/<< parameters.runtime >>/<< parameters.slug >>.zip speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<< parameters.slug >>-$SEMVER.zip
      - when:
          condition: << parameters.installer >>
          steps:
@@ -191,6 +199,30 @@ jobs:
          from: '"speckle-sharp-ci-tools/Installers/"'
          to: s3://speckle-releases/installers/

+  deploy-manager2:
+    docker:
+      - image: mcr.microsoft.com/dotnet/sdk:6.0
+    parameters:
+      slug:
+        type: string
+      os:
+        type: string
+      extension:
+        type: string
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Install Manager Feed CLI
+          command: dotnet tool install --global Speckle.Manager.Feed
+      - run:
+          name: Upload new version
+          command: |
+            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;)
+            SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
+            /root/.dotnet/tools/Speckle.Manager.Feed deploy -s << parameters.slug >> -v ${SEMVER} -u https://releases.speckle.dev/installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >> -o << parameters.os >> -f speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<< parameters.slug >>-${SEMVER}.<< parameters.extension >>
+
 workflows:
  build: # build the installers, but don't persist to workspace for deployment
    jobs:
@@ -200,9 +232,7 @@ workflows:
              only:
                - main
                - /ci\/.*/
-
      - build-connector-win:
-          slug: blender
          requires:
            - get-ci-tools
          filters:
@@ -210,9 +240,7 @@ workflows:
              only:
                - main
                - /ci\/.*/
-
      - build-connector-mac:
-          slug: blender-mac
          requires:
            - get-ci-tools
          filters:
@@ -238,29 +266,55 @@ workflows:
            - get-ci-tools
          filters:
            tags:
-              only: /^(all|win)\/([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
            branches:
              ignore: /.*/

-      - build-connector-mac:
-          name: build-deploy-connector-mac
-          slug: blender-mac
-          installer: true
-          requires:
-            - get-ci-tools
-          filters:
-            tags:
-              only: /^(all|mac)\/([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
-            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: 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: /.*/

      - deploy:
          requires:
            - get-ci-tools
            - build-deploy-connector-win
-            - build-deploy-connector-mac
          filters:
            tags:
-              only: /^(all|win|mac)\/([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
            branches:
              ignore: /.*/
+
+      - deploy-manager2:
+          slug: blender
+          os: Win
+          extension: exe
+          requires:
+            - get-ci-tools
+            - deploy
+          filters:
+            tags:
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+            branches:
+              ignore: /.*/ # For testing only! /ci\/.*/
Author	SHA1	Message	Date
izzy lyseggen	2ed0685b10	fix(ci): soz just me clowning w regex (#108 )	2022-08-26 12:09:51 +01:00
izzy lyseggen	877e616188	ci: temp remove mac steps and clean tags (#107 )	2022-08-26 12:04:14 +01:00
izzy lyseggen	2e3e258a9a	ci: deploy to manager 2 (#106 ) * ci: add manager 2 feed * ci: update manager2 requirements	2022-08-26 11:47:50 +01:00
izzy lyseggen	1e1c790eb4	ci: blender mac pt 2 electric boogaloo (#100 ) * ci: build mac installers for both intel & arm * ci: fix conditional logic? * ci: final cleanup	2022-06-29 17:04:49 +01:00