Merge branch 'cicd' into develop

pyrevitlabs · Oct 25, 2021 · d8f6985 · d8f6985
2 parents 10421f2 + 6d1e3bb
commit d8f6985
Show file tree

Hide file tree

Showing 220 changed files with 2,318 additions and 4,892 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,75 @@
+name: pyRevitCI
+on: [push]
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      # under $GITHUB_WORKSPACE
+      - uses: actions/checkout@v2
+      - uses: snickerbockers/submodules-init@v4
+
+      - name: Setup Python 3.9
+        uses: actions/setup-python@v2.2.2
+        with:
+          python-version: 3.9
+
+      - name: Install pipenv
+        run: |
+          pip install pipenv
+          pipenv install
+
+      - name: Check build environment
+        run: pipenv run pyrevit check
+
+      - name: Build Binaries
+        run: |
+          pipenv run pyrevit set year
+          pipenv run pyrevit set build
+          pipenv run pyrevit set products
+          pipenv run pyrevit build all
+
+      - name: Get Build Version
+        id: buildversion
+        uses: juliangruber/read-file-action@v1
+        with:
+          path: pyrevitlib/pyrevit/version
+
+      - name: Sign Binaries
+        uses: skymatic/code-sign-action@v1
+        with:
+          certificate: '${{ secrets.CERTIFICATE }}'
+          password: '${{ secrets.PASSWORD }}'
+          certificatesha1: '${{ secrets.CERTIFICATESHA1 }}'
+          certificatename: '${{ secrets.CERTIFICATENAME }}'
+          description: 'pyRevit'
+          timestampUrl: 'http://timestamp.digicert.com'
+          folder: 'bin'
+          recursive: true
+
+      - name: Build Installers
+        run: |
+          pipenv run pyrevit build installers
+
+      - name: Sign Installers
+        uses: skymatic/code-sign-action@v1
+        with:
+          certificate: '${{ secrets.CERTIFICATE }}'
+          password: '${{ secrets.PASSWORD }}'
+          certificatesha1: '${{ secrets.CERTIFICATESHA1 }}'
+          certificatename: '${{ secrets.CERTIFICATENAME }}'
+          description: 'pyRevit'
+          timestampUrl: 'http://timestamp.digicert.com'
+          folder: 'dist'
+          recursive: true
+
+      # default retention period is 90 days
+      # https://github.com/marketplace/actions/upload-a-build-artifact#retention-period
+      - name: Upload Installers
+        uses: actions/upload-artifact@v2
+        with:
+          name: pyrevit-installers
+          path: |
+            dist/pyRevit_${{ steps.buildversion.outputs.content }}_signed.exe
+            dist/pyRevit_${{ steps.buildversion.outputs.content }}_admin_signed.exe
+            dist/pyRevit_CLI_${{ steps.buildversion.outputs.content }}_signed.exe
+            dist/pyRevit_CLI_${{ steps.buildversion.outputs.content }}_admin_signed.exe
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,4 +14,20 @@
         "--line-length=80"
     ],
     "editor.formatOnSave": false,
+    "files.exclude": {
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/CVS": true,
+        "**/.DS_Store": true,
+        "**/Icon?": true,
+        "**/Thumbs.db": true,
+        "**/.vs": true,
+        "**/.sync": true,
+        "*/**/bin": true,
+        "**/obj": true,
+        "**/__pycache__": true,
+        "**/Prerequisites": true,
+    },
+    "python.pythonPath": "C:\\Users\\ehsan\\.virtualenvs\\pyrevit-dev-2PO7Kqjk\\Scripts\\python.exe"
 }
diff --git a/bin/pyrevit.admin b/bin/pyrevit.admin
diff --git a/bin/pyrevit.manifest b/bin/pyrevit.manifest
diff --git a/bin/pyrevit.user b/bin/pyrevit.user
diff --git a/dev/Directory.Build.props b/dev/Directory.Build.props
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <PyRevitRootDir>$(MSBuildThisFileDirectory)\..\</PyRevitRootDir>
+
+    <PyRevitBinDir>$(PyRevitRootDir)\bin\</PyRevitBinDir>
+    <PyRevitEnginesDir>$(PyRevitBinDir)engines\</PyRevitEnginesDir>
+
+    <PyRevitDevDir>$(PyRevitRootDir)\dev\</PyRevitDevDir>
+    <PyRevitDevLibsDir>$(PyRevitDevDir)\libs\</PyRevitDevLibsDir>
+    <PyRevitDevModulesDir>$(PyRevitDevDir)\modules\</PyRevitDevModulesDir>
+
+    <PyRevitLibDir>$(PyRevitRootDir)\pyrevitlib\</PyRevitLibDir>
+    <PyRevitExtDir>$(PyRevitRootDir)\extensions\</PyRevitExtDir>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputType>Library</OutputType>
+    <TargetFramework>net48</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
+    <AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)'=='Release'">
+    <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Version>4.8.8</Version>
+    <Copyright>Copyright © 2014-2021</Copyright>
+    <Company>pyRevitLabs.io</Company>
+  </PropertyGroup>
+</Project>
diff --git a/dev/Directory.Build.targets b/dev/Directory.Build.targets
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
diff --git a/dev/_autocomplete.py b/dev/_autocomplete.py
@@ -210,7 +210,10 @@ def parse_docopts(docopts_filepath):
 def build_autocmp(_: Dict[str, str]):
     """Build CLI shell autocomplete utility"""
     print("Updating autocomplete utility dependencies...")
-    utils.system(["go", "get", "github.com/posener/complete"])
+    utils.system(
+        ["go", "get", "-u", r"./..."],
+        cwd=op.abspath(configs.AUTOCOMPPATH)
+        )
     print("Autocomplete utility dependencies successfully updated")
 
     # generate go autocomplete source from usage patterns
@@ -223,6 +226,9 @@ def build_autocmp(_: Dict[str, str]):
     print("Building autocomplete utility...")
     target = op.abspath(configs.AUTOCOMPBIN)
     utils.system(["go", "fmt", configs.AUTOCOMP])
-    utils.system(["go", "build", "-o", target, configs.AUTOCOMP])
+    utils.system(
+        ["go", "build", "-o", target, op.abspath(configs.AUTOCOMP)],
+        cwd=op.abspath(configs.AUTOCOMPPATH)
+        )
     print("Building autocomplete utility completed successfully")
-    os.remove(configs.AUTOCOMP)
+    # os.remove(configs.AUTOCOMP)
diff --git a/dev/_buildall.py b/dev/_buildall.py
@@ -15,7 +15,7 @@
 ARTIFACTS = ['bin', 'obj', '.vs', 'TestResults']
 
 
-def build_clean(_: Dict[str, str]):
+def clean_build(_: Dict[str, str]):
     """Clean bin and obj from projects"""
     for dirname, subdirs, _ in os.walk(configs.DEVPATH):
         for subdir in subdirs:

diff --git a/dev/_install.py b/dev/_install.py
@@ -1,5 +1,6 @@
 """Manage tasks related to the build environment"""
 # pylint: disable=invalid-name,broad-except
+import os.path as op
 from collections import namedtuple
 from typing import Dict
 
@@ -9,11 +10,10 @@
 
 
 REQUIRED_TOOLS = [
-    RequiredTool(name="msbuild", get="", step="build"),
+    RequiredTool(name="dotnet", get="", step="build"),
     RequiredTool(name="go", get="", step="build"),
     RequiredTool(name="gcc", get="", step="build"),
-    RequiredTool(name="signtool", get="", step="release"),
-    RequiredTool(name="advancedinstaller.com", get="", step="release"),
+    RequiredTool(name="iscc", get=r"C:\Program Files (x86)\Inno Setup 6", step="release"),
 ]
 
 
@@ -27,7 +27,7 @@ def check(_: Dict[str, str]):
     all_pass = True
     # check required tools
     for rtool in REQUIRED_TOOLS:
-        has_tool = utils.where(rtool.name)
+        has_tool = utils.where(op.join(rtool.get, rtool.name))
         if has_tool:
             print(utils.colorize(f"[ <grn>PASS</grn> ]\t{rtool.name} is ready"))
         else:

diff --git a/dev/_labs.py b/dev/_labs.py
@@ -3,7 +3,7 @@
 import sys
 import os.path as op
 import logging
-from typing import Dict
+from typing import Dict, Optional
 
 # dev scripts
 from scripts import utils
@@ -19,7 +19,7 @@ def _abort(message):
     sys.exit(1)
 
 
-def _build(name: str, sln: str, config: str):
+def _build(name: str, sln: str, config: str, print_output: Optional[bool] = False):
     utils.ensure_windows()
 
     # clean
@@ -29,13 +29,15 @@ def _build(name: str, sln: str, config: str):
     print(f"Building {name}...")
     report = utils.system(
         [
-            "msbuild",
+            "dotnet",
+            "build",
             slnpath,
-            "-t:Clean;Restore;Build",
-            f"-p:Configuration={config}",
-        ]
+            "-c",
+            f"{config}",
+        ],
+        dump_stdout=print_output
     )
-    passed, report = utils.parse_msbuild_output(report)
+    passed, report = utils.parse_dotnet_build_output(report)
     if not passed:
         _abort(report)
     else:
@@ -44,8 +46,7 @@ def _build(name: str, sln: str, config: str):
 
 def build_engines(_: Dict[str, str]):
     """Build pyRevit engines"""
-    _build("default ironpython engine", configs.LOADERS, "Release")
-    _build("ironpython 2.7.* engines", configs.LOADERS, "Release")
+    _build("ironpython engines", configs.LOADERS, "Release")
     _build("cpython 3.7 engine", configs.CPYTHONRUNTIME, "ReleasePY37")
     _build("cpython 3.8 engine", configs.CPYTHONRUNTIME, "ReleasePY38")