Merge pull request #78 from specklesystems/JR-Morgan-patch-1

Update config.yml

.circleci/config.yml

@@ -61,7 +61,6 @@ jobs:
   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
@@ -73,12 +72,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: ./
-      - run:
-          name: Create Innosetup signing cert
-          shell: powershell.exe
-          command: |
-            echo $env:PFX_B64 > "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.txt"
-            certutil -decode "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.txt" "speckle-sharp-ci-tools\SignTool\AEC Systems Ltd.pfx"
       - run:
           name: Patch
           shell: powershell.exe
@@ -93,12 +86,46 @@ jobs:
             pip install setuptools
             python setup.py sdist bdist_wheel
             Copy-Item -Path "dist\speckle_toolbox-$($ver)-py3-none-any.whl" -Destination "speckle_arcgis_installer"
-      - run: 
-          name: Build Installer
-          shell: cmd.exe
-          command:
-            | # If no tag, use 0.0.0.1 and don't make any YML (for testing only!)
-            speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\arcgis.iss /Sbyparam=$p
+
+      - run:
+          name: Exit if External PR
+          shell: bash.exe
+          command: if [ "$CIRCLE_PR_REPONAME" ]; then circleci-agent step halt; fi
+      
+      - unless: # Build installers unsigned on non-tagged builds
+          condition: << pipeline.git.tag >>
+          steps:
+            - run:
+                name: Build Installer
+                shell: cmd.exe #does not work in powershell
+                command: 
+                  speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\arcgis.iss /Sbyparam=$p
+
+      - when: # Setup certificates and build installers signed for tagged builds
+          condition: << pipeline.git.tag >>
+          steps:
+            - run: # Installs digicert signing tools for windows
+                name: "Digicert Signing Manager Setup"
+                command: |
+                  cd C:\
+                  curl.exe -X GET  https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:$env:SM_API_KEY" -o smtools-windows-x64.msi
+                  msiexec.exe /i smtools-windows-x64.msi /quiet /qn | Wait-Process
+            - run: # Creates the Auth cert and the signing public PEM cert
+                name: Create Auth & OV Signing Cert
+                command: |
+                  cd C:\
+                  echo $env:SM_CLIENT_CERT_FILE_B64 > certificate.txt
+                  certutil -decode certificate.txt certificate.p12
+            - run: # Syncs certificates from Digicert into local user store
+                name: Sync Certs
+                command: |
+                  & $env:SSM\smksp_cert_sync.exe
+            - run: 
+                name: Build Installer
+                shell: cmd.exe
+                command:
+                  | # If no tag, use 0.0.0.1 and don't make any YML (for testing only!)
+                  speckle-sharp-ci-tools\InnoSetup\ISCC.exe speckle-sharp-ci-tools\arcgis.iss /Sbyparam=$p /DSIGN_INSTALLER /DCODE_SIGNING_CERT_FINGERPRINT=%SM_CODE_SIGNING_CERT_SHA1_HASH%
       - when:
           condition: << parameters.installer >>
           steps:
@@ -107,6 +134,8 @@ jobs:
                 paths:
                   - speckle-sharp-ci-tools/Installers
                   - speckle_arcgis_installer
+    environment:
+      SSM: 'C:\Program Files\DigiCert\DigiCert One Signing Manager Tools'
 
   publish-github-release:
     docker:
@@ -158,7 +187,7 @@ workflows: #happens with every PR to main
           requires:
             - get-ui
             - get-ci-tools
-          context: innosetup
+          context: digicert-keylocker
 
   deploy: # build installers and deploy
     jobs:
@@ -182,7 +211,7 @@ workflows: #happens with every PR to main
             - get-ui
             - get-ci-tools
           filters: *deploy_filters
-          context: innosetup
+          context: digicert-keylocker
       - publish-github-release:
           requires:
             - build-deploy-connector-win
@@ -195,4 +224,4 @@ workflows: #happens with every PR to main
           requires:
             - build-deploy-connector-win
           filters: *deploy_filters
-          context: do-spaces-speckle-releases
+          context: do-spaces-speckle-releases

speckle_toolbox/esri/toolboxes/speckle/speckle/converter/layers/layer_conversions.py

@@ -2199,15 +2199,17 @@ def addRasterMainThread(obj: Tuple):
             print(e)
         # report on receive:
 
-        try:
-            layerName = newName.split(shortName)[0] + shortName  # + ("_" + geom_print)
-        except:
-            layerName = newName
+        layerName = removeSpecialCharacters(layer.name)
         shortName = newName.split(SYMBOL)[len(newName.split(SYMBOL)) - 1][:50]
-        finalName = shortName  # + ("_" + geom_print)
+        
+        try:
+            layerName = newName.split(shortName)[0] + shortName + "_Speckle"
+        except:
+            layerName = newName + "_Speckle"
+        finalName = shortName + "_Speckle"
+
         dataStorage.latestActionLayers.append(finalName)
 
-        layerName = removeSpecialCharacters(layer.name) + "_Speckle"
         rasterHasSr = False
 
         p: str = (
@@ -2328,7 +2330,7 @@ def addRasterMainThread(obj: Tuple):
         rasterLayer = arcpy.management.MakeRasterLayer(
             full_path, "x" + str(random.randint(100000, 500000))
         ).getOutput(0)
-        rasterLayer.name = newName
+        rasterLayer.name = finalName
         active_map.addLayerToGroup(layerGroup, rasterLayer)
 
         rl2 = None
@@ -2336,11 +2338,11 @@ def addRasterMainThread(obj: Tuple):
             SYMBOL + SYMBOL, SYMBOL
         )
         for l in project.activeMap.listLayers():
-            if l.longName == newGroupName.replace(SYMBOL, "\\") + newName:
+            if l.longName == newGroupName.replace(SYMBOL, "\\") + finalName:
                 rl2 = l
                 break
         rasterLayer = rasterRendererToNative(
-            project, active_map, layerGroup, layer, rl2, rasterPathsToMerge, newName
+            project, active_map, layerGroup, layer, rl2, rasterPathsToMerge, finalName
         )
 
         try: