Merge pull request #1463 from specklesystems/main

Update from `main` onto `release/2.8`
specklesystems · Aug 1, 2022 · 65cdd42 · 65cdd42
2 parents a5aef51 + 1c39d04
commit 65cdd42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -62,4 +62,4 @@ workflows:
             branches:
               ignore: /.*/
             tags:
-              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?(\/all)?$/
+              only: /^(nugets\/)?([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?(\/all)?$/
diff --git a/.circleci/scripts/config-generator.py b/.circleci/scripts/config-generator.py
@@ -177,7 +177,7 @@ def getNewDeployJob(jobName: str):
     slug = jobName.split("-build")[0]
     isMac = slug.find("-mac") != -1
     deployJob: Dict[str, Any] = {
-        "slug": slug,
+        "slug": slug.split("-mac")[0] if isMac else slug,
         "name": slug + "-deploy",
         "os": "OSX" if isMac else "Win",
         "extension": "zip" if isMac else "exe",

diff --git a/.circleci/scripts/config-template.yml b/.circleci/scripts/config-template.yml
@@ -16,7 +16,7 @@ commands:
           name: Publish nuget package
           command: |
             $tag = if([string]::IsNullOrEmpty($env:CIRCLE_TAG)) { "0.0.$($env:WORFKLOW_NUM)-beta/a" } else { $env:CIRCLE_TAG }
-            $version = $tag.Split("/")[0]  
+            $version = $tag.Split("/")[1]  
             msbuild <<parameters.projectfilepath>> /p:Version="$version" /p:Configuration=Release /p:WarningLevel=0 /p:IsDesktopBuild=false -t:pack
             dotnet nuget push **/*.nupkg -s https://api.nuget.org/v3/index.json -k $env:NUGET_APIKEY -n true
           environment:
@@ -340,7 +340,7 @@ workflows:
             branches:
               ignore: /.*/ # For testing only: /ci\/.*/
             tags:
-              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w{1,10})\/(nuget-core|nugets)?$/
+              only: /^(nuget-core|nugets)\/([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w{1,10})?$/
           post-steps:
             - packandpublish:
                 projectfilepath: Core/Core.sln
@@ -350,7 +350,7 @@ workflows:
             branches:
               ignore: /.*/ # For testing only: /ci\/.*/
             tags:
-              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w{1,10})\/(nuget-objects|nugets)?$/
+              only: /^(nuget-objects|nugets)\/([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w{1,10})?$/
           post-steps:
             - packandpublish:
                 projectfilepath: Objects/Objects.sln
@@ -360,7 +360,7 @@ workflows:
             branches:
               ignore: /.*/ # For testing only: /ci\/.*/
             tags:
-              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w{1,10})\/(nuget-dui|nugets)?$/
+              only: /^(nuget-dui|nugets)\/([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w{1,10})?$/
           post-steps:
             - packandpublish:
                 projectfilepath: DesktopUI2/DesktopUI2/DesktopUI2.csproj