build for osx 13 for arm

.circleci/config.yml

@@ -1,38 +1,7 @@
 version: 2.1
 
 orbs:
-  python: circleci/python@1.3.2
-  # Using windows for builds
   win: circleci/windows@2.4.0
-  # Upload artifacts to s3
-  aws-s3: circleci/aws-s3@2.0.0
-
-commands:
-  install-specklepy-windows: # Reusable job for installing `specklepy` for windows machines
-    parameters:
-      python-version:
-        type: string
-        default: "" # leave blank for blender v2.93
-    steps:
-      - when:
-          condition: << parameters.python-version >>
-          steps:
-            - run:
-                name: Upgrade python version << parameters.python-version >>
-                shell: powershell.exe
-                command: |
-                  choco upgrade python --version=<< parameters.python-version >>
-                  refreshenv
-                  python --version
-      - run:
-          name: Install specklepy into modules directory
-          shell: powershell.exe
-          command: |
-            $pyarr=(python --version).split(' ')[1].split('.')
-            $pyver=($pyarr[0..1] -join '.')
-            echo "using python version:" $pyver
-            $specklepy=(python patch_version.py)
-            python -m pip install --target=./modules-$pyver specklepy==$specklepy
 
 jobs:
   package-connector:
@@ -40,157 +9,42 @@ jobs:
       - image: cimg/python:3.11.0
     steps:
       - checkout
+      - run:
+          name: Setup SEMVER value
+          command: |
+            SEMVER=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;)
+            echo $SEMVER > ./SEMVER
+            python3 patch_version.py $SEMVER
       - run:
           name: install dependencies
           command: poetry install --only main
       - run:
           name: export package dependencies
           command: ./export_dependencies.sh
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - bpy_speckle
+            - patch_installer.py
+            - SEMVER
+
+  build-connector-zip:
+    docker:
+      - image: cimg/python:3.11.0
+    steps:
+      - attach_workspace:
+          at: ./
+      - run: &restore_semver
+          name: Restore Semver
+          command: SEMVER=$(cat ./SEMVER) && echo $SEMVER
       - run:
           name: Package to Zip
           command: zip -r bpy_speckle.zip bpy_speckle
-      - store_artifacts:
-          path: bpy_speckle.zip
-
-
-  build-connector-win: # Reusable job for basic connectors
-    executor:
-      name: win/default # comes with python 3.7.3
-      shell: cmd.exe
-    parameters:
-      slug:
-        type: string
-        default: "blender"
-      installer:
-        type: boolean
-        default: false
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ./
-      - install-specklepy-windows
-      - install-specklepy-windows:
-          python-version: "3.9.10"
-      - install-specklepy-windows:
-          python-version: "3.10.2"
-      - run:
-          name: Patch
-          shell: powershell.exe
-          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 }
-            $semver = if($tag.Contains('/')) {$tag.Split("/")[1] } else { $tag }
-            $ver = if($semver.Contains('-')) {$semver.Split("-")[0] } else { $semver }
-            $version = "$($ver).$($env:CIRCLE_BUILD_NUM)"
-            $channel = if($semver.Contains('-')) { "prerelease" } else { "latest" }
-            New-Item -Force "speckle-sharp-ci-tools/Installers/blender/$channel.yml" -ItemType File -Value "version: $semver"
-            echo $semver
-            python patch_version.py $semver
-      - run:
-          name: Installer
-          shell: cmd.exe #does not work in powershell
-          command: speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\blender.iss /Sbyparam=$p
-      - when:
-          condition: << parameters.installer >>
-          steps:
-            - persist_to_workspace:
-                root: ./
-                paths:
-                  - speckle-sharp-ci-tools/Installers
-
-  build-connector-mac:
-    macos:
-      xcode: 12.5.1
-    parameters:
-      slug:
-        type: string
-        default: "blender-mac"
-      installername:
-        type: string
-        default: "SpeckleBlenderInstall"
-      runtime:
-        type: string
-        default: "osx-x64"
-      installer:
-        type: boolean
-        default: false
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ./
-      - run:
-          name: Install mono
-          command: |
-            HOMEBREW_NO_AUTO_UPDATE=1 brew install mono
-      # Compress build files
-      - run:
-          name: Install dotnet
-          command: curl -sSL https://dot.net/v1/dotnet-install.sh | bash /dev/stdin
-      - run:
-          name: Build & Patch 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-]*\///')
-            VER=$(echo "$SEMVER" | sed -e 's/-beta//')
-            VERSION=$(echo $VER.$CIRCLE_BUILD_NUM)
-            CHANNEL=$(if [[ "$VERSION" == *"-"* ]]; then echo $(cut -d "-" -f2 \<\<\< $VERSION); else echo latest; fi)
-            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: |
-            zip -r << parameters.slug >>.zip bpy_speckle/
-      - run:
-          name: Copy connector files to installer
-          command: |
-            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: Build Mac installer
-          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/<< parameters.runtime >>/
-            zip -r << parameters.slug >>.zip ./
-      - store_artifacts:
-          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/<< parameters.runtime >>/<< parameters.slug >>.zip speckle-sharp-ci-tools/Installers/<< parameters.slug >>/<< parameters.slug >>-$SEMVER.zip
-      - when:
-          condition: << parameters.installer >>
-          steps:
-            - persist_to_workspace:
-                root: ./
-                paths:
-                  - speckle-sharp-ci-tools/Installers
-
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - bpy_speckle.zip
+  
   get-ci-tools: # Clones our ci tools and persists them to the workspace
     docker:
       - image: cimg/base:2021.01
@@ -198,18 +52,80 @@ jobs:
       - run: # Could not get ssh to work, so using a personal token
           name: Clone
           command: git clone https://$GITHUB_TOKEN@github.com/specklesystems/speckle-sharp-ci-tools.git speckle-sharp-ci-tools
+      - run:
+          command: cd speckle-sharp-ci-tools && git checkout blender/installer-changes
       - persist_to_workspace:
           root: ./
           paths:
             - speckle-sharp-ci-tools
 
+  build-installer-win:
+    executor:
+      name: win/default
+      shell: cmd.exe
+    steps:
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Patch installer
+          shell: powershell.exe
+          command: python patch_installer.py (Get-Content -Raw SEMVER)
+      - run:
+          name: Installer
+          shell: cmd.exe #does not work in powershell
+          command: speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\blender.iss /Sbyparam=$p
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - speckle-sharp-ci-tools/Installers/blender/blender-*.exe
 
-  deploy-connector-new:
+  build-dotnet-installer:
     docker:
       - image: mcr.microsoft.com/dotnet/sdk:6.0
     parameters:
+      runtime:
+        type: string
       slug:
         type: string
+      installer_path:
+        type: string
+        default: speckle-sharp-ci-tools/Mac/SpeckleBlenderInstall
+    steps:
+      - attach_workspace:
+          at: ./
+      - run: *restore_semver
+      - run:
+          name: ensure zip
+          command: apt update && apt install -y zip
+      - run:
+          name: Copy connector files to installer
+          command: |
+            mkdir -p << parameters.installer_path >>/.installationFiles
+            cp bpy_speckle.zip << parameters.installer_path >>/.installationFiles
+      - run:
+          name: Build installer
+          command: dotnet publish <<parameters.installer_path>>/SpeckleBlenderInstall.sln -r << parameters.runtime >> -c Release
+            # cd <<parameters.installer_path>>/bin/Release/net6.0/<< parameters.runtime >>/publish/
+            # zip -r << parameters.slug >>-${SEMVER}.zip <<parameters.installer_path>>/bin/Release/net6.0/<< parameters.runtime >>/publish/. 
+            # cd ${CIRCLE_WORKING_DIRECTORY}
+      - run:
+          name: Zip installer
+          command: |
+            SEMVER=$(cat ./SEMVER)
+            echo $SEMVER
+            mkdir -p speckle-sharp-ci-tools/Installers/blender
+            (cd <<parameters.installer_path>>/bin/Release/net6.0/<< parameters.runtime >>/publish/ && zip -r - ./) > << parameters.slug >>-${SEMVER}.zip
+            cp << parameters.slug >>-${SEMVER}.zip speckle-sharp-ci-tools/Installers/blender/
+
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - speckle-sharp-ci-tools/Installers/blender/<< parameters.slug >>*.zip
+
+  deploy-connector:
+    docker:
+      - image: mcr.microsoft.com/dotnet/sdk:6.0
+    parameters:
       file_slug:
         type: string
       os:
@@ -226,150 +142,99 @@ jobs:
       - run:
           name: Install Manager Feed CLI
           command: dotnet tool install --global Speckle.Manager.Feed
+      - run: *restore_semver
       - run:
           name: Upload new version
+          # this is where the installer gets the semver baked into the file name
           command: |
-            TAG=$(if [ "${CIRCLE_TAG}" ]; then echo $CIRCLE_TAG; else echo "0.0.0"; fi;)
-            SEMVER=$(echo "$TAG" | sed -e 's/\/[a-zA-Z-]*//')
+            SEMVER=$(cat ./SEMVER)
+            echo $SEMVER
             /root/.dotnet/tools/Speckle.Manager.Feed deploy \
-                -s << parameters.slug >> \
+                -s blender \
                 -v ${SEMVER} \
-                -u https://releases.speckle.dev/installers/<< parameters.slug >>/<< parameters.file_slug >>-${SEMVER}.<< parameters.extension >> \
+                -u https://releases.speckle.dev/installers/blender/<< parameters.file_slug >>-${SEMVER}.<< parameters.extension >> \
                 -o << parameters.os >> \
                 -a << parameters.arch >> \
-                -f speckle-sharp-ci-tools/Installers/<< parameters.file_slug >>/<< parameters.file_slug >>-${SEMVER}.<< parameters.extension >>
+                -f speckle-sharp-ci-tools/Installers/blender/<< parameters.file_slug >>-${SEMVER}.<< parameters.extension >>
 
 workflows:
   build: # build the installers, but don't persist to workspace for deployment
     jobs:
       - package-connector:
-          name: Package Addon Zip
-          filters:
-            branches:
-              only:
-                - gergo/newInstaller
+          filters: &build_filters
+            tags:
+              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
+      
+      - build-connector-zip:
+          requires:
+            - package-connector
+          filters: *build_filters
+
 
       - get-ci-tools:
-          filters:
-            branches:
-              only:
-                - main
-                - /ci\/.*/
-      - build-connector-win:
-          name: Windows Build
-          requires:
-            - get-ci-tools
-          filters:
-            branches:
-              only:
-                - 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
-  deploy: # build installers and deploy
-    jobs:
-      - get-ci-tools:
-          filters:
-            tags:
-              only: /.*/
-            branches:
-              ignore: /.*/
+          filters: *build_filters
 
-      - build-connector-win:
-          name: Windows Build
-          slug: blender
-          installer: true
+      - build-installer-win:
+          name: Windows Installer Build
           requires:
+            - package-connector
             - get-ci-tools
-          filters:
-            tags:
-              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
-            branches:
-              ignore: /.*/
+          filters: *build_filters
 
-      - build-connector-mac:
-          name: Mac ARM Build
-          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: Mac Intel Build
-          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-connector-new:
-          name: deploy-win
-          slug: blender
+      - deploy-connector:
+          name: deploy-windows
           file_slug: blender
-          os: Win
-          extension: exe
+          os: WIN
           arch: Any
+          extension: exe
           requires:
-            - Windows Build
-            - Mac ARM Build
+            - Windows Installer Build
             - Mac Intel Build
-          filters:
+            - Mac ARM Build
+          filters: &deploy_filters
+            branches:
+              ignore: /.*/
             tags:
               only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
-            branches:
-              ignore: /.*/ # For testing only! /ci\/.*/
 
-      - deploy-connector-new:
-          name: deploy-mac-intel
-          slug: blender
-          file_slug: blender-mac-intel
-          os: OSX
-          arch: Intel
-          extension: zip
+      - build-dotnet-installer:
+          name: Mac ARM Build
+          slug: blender-mac-arm
+          runtime: osx.13-arm64
           requires:
-            - Windows Build
-            - Mac ARM Build
-            - Mac Intel Build
-          filters:
-            tags:
-              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
-            branches:
-              ignore: /.*/ # For testing only! /ci\/.*/
-              
-      - deploy-connector-new:
+            - get-ci-tools
+            - build-connector-zip
+          filters: *build_filters
+
+      - deploy-connector:
           name: deploy-mac-arm
-          slug: blender
           file_slug: blender-mac-arm
           os: OSX
           arch: Arm
           extension: zip
           requires:
-            - Windows Build
-            - Mac ARM Build
+            - Windows Installer Build
             - Mac Intel Build
-          filters:
-            tags:
-              only: /([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?$/
-            branches:
-              ignore: /.*/ # For testing only! /ci\/.*/
+            - Mac ARM Build
+          filters: *deploy_filters
+
+      - build-dotnet-installer:
+          name: Mac Intel Build
+          slug: blender-mac-intel
+          runtime: osx-x64
+          requires:
+            - get-ci-tools
+            - build-connector-zip
+          filters: *build_filters
+
+      - deploy-connector:
+          name: deploy-mac-intel
+          file_slug: blender-mac-intel
+          os: OSX
+          arch: Intel
+          extension: zip
+          requires:
+            - Windows Installer Build
+            - Mac Intel Build
+            - Mac ARM Build
+          filters: *deploy_filters

.gitignore

@@ -12,4 +12,5 @@ __pycache__/
 Installers/
 modules/
 .tool-versions
-requirements.txt
+requirements.txt
+SEMVER

bpy_speckle/installer.py

@@ -88,8 +88,8 @@ def install_requirements() -> None:
 
 
 def install_dependencies() -> None:
-    # if not is_pip_available():
-    #     ensure_pip()
+    if not is_pip_available():
+        ensure_pip()
 
     install_requirements()
 

patch_installer.py

@@ -0,0 +1,20 @@
+import sys
+from pathlib import Path
+
+
+def patch_installer(tag: str):
+    """Patches the installer with the correct connector version and specklepy version"""
+    tag = tag.replace("\n", "")
+    iss_file = "speckle-sharp-ci-tools/blender.iss"
+    iss_path =  Path(iss_file)
+    lines = iss_path.read_text().split("\n")
+    lines.insert(12, f'#define AppVersion "{tag.split("-")[0]}"')
+    lines.insert(13, f'#define AppInfoVersion "{tag}"')
+
+    iss_path.write_text("\n".join(lines))
+    print(f"Patched installer with connector v{tag}")
+
+
+if __name__ == "__main__":
+    tag = sys.argv[1]
+    patch_installer(tag)

patch_version.py

@@ -1,7 +1,6 @@
 import re
 import sys
 
-
 def patch_connector(tag):
     """Patches the connector version within the connector init file"""
     bpy_file = "bpy_speckle/__init__.py"
@@ -19,48 +18,13 @@ def patch_connector(tag):
         with open(bpy_file, "w") as file:
             file.writelines(lines)
 
-
-def patch_installer(tag):
-    """Patches the installer with the correct connector version and specklepy version"""
-    iss_file = "speckle-sharp-ci-tools/blender.iss"
-
-    py_tag = get_specklepy_version()
-    with open(iss_file, "r") as file:
-        lines = file.readlines()
-        lines.insert(11, f'#define SpecklepyVersion "{py_tag}"\n')
-        lines.insert(12, f'#define AppVersion "{tag.split("-")[0]}"\n')
-        lines.insert(13, f'#define AppInfoVersion "{tag}"\n')
-
-        with open(iss_file, "w") as file:
-            file.writelines(lines)
-            print(f"Patched installer with connector v{tag} and specklepy v{py_tag}")
-
-
-def get_specklepy_version():
-    """Get version of specklepy to install from the pyproject.toml"""
-    version = "2.3.3"
-    with open("pyproject.toml", "r") as f:
-        lines = [line for line in f if line.startswith("specklepy = ")]
-        if not lines:
-            raise Exception("Could not find specklepy in pyproject.toml")
-        match = re.search(r"[0-9]+(\.[0-9]+)*", lines[0])
-        if match:
-            version = match[0]
-    return version
-
-
 def main():
-    if len(sys.argv) < 2:
-        print(get_specklepy_version())
-        return
-
     tag = sys.argv[1]
     if not re.match(r"([0-9]+)\.([0-9]+)\.([0-9]+)", tag):
         raise ValueError(f"Invalid tag provided: {tag}")
 
     print(f"Patching version: {tag}")
     patch_connector(tag.split("-")[0])
-    patch_installer(tag)
 
 
 if __name__ == "__main__":