updating example project to 2022.3, using cygwin64 as the default cyg…

…win name, and adding additional logging around pipeline step execution failures
tbg10101 · Aug 4, 2023 · fc91523 · fc91523
1 parent 7f9abee
commit fc91523
Show file tree

Hide file tree

Showing 11 changed files with 199 additions and 98 deletions.
diff --git a/Editor/Abstractions/AbstractBuildPipeline.cs b/Editor/Abstractions/AbstractBuildPipeline.cs
@@ -38,8 +38,16 @@ internal void Execute(string outputDir, Action<IEnumerable<Action>> enqueueToMai
 
                             consecutiveMainThreadSteps.Add(() => {
                                 Debug.Log($"Step starting on main thread: {Name}-{mainThreadBuildStep.GetType().Name}");
-                                mainThreadBuildStep.Execute(targetOutputDir, this);
-                                Debug.Log($"Step complete: {Name}-{mainThreadBuildStep.GetType().Name}");
+
+                                try {
+                                    mainThreadBuildStep.Execute(targetOutputDir, this);
+                                    Debug.Log($"Step complete: {Name}-{mainThreadBuildStep.GetType().Name}");
+                                } catch (Exception e) {
+                                    Debug.LogError($"Step failed: {Name}-{mainThreadBuildStep.GetType().Name}\n" +
+                                                   $"{e.GetType().FullName}: {e.Message}\n{e.StackTrace}\n");
+                                    throw;
+                                }
+
                                 uncompletedStepsCount--;
                             });
 
@@ -58,7 +66,7 @@ internal void Execute(string outputDir, Action<IEnumerable<Action>> enqueueToMai
                     }
                 }
             } catch (Exception e) {
-                Debug.LogException(e);
+                Debug.LogError($"Exception while executing build pipeline: {e.Message}\n{e.StackTrace}\n");
             }
         }
     }

diff --git a/Editor/Steps/ArchiveCygwinTar.cs b/Editor/Steps/ArchiveCygwinTar.cs
@@ -6,8 +6,8 @@
 namespace Software10101.BuildScripting.Editor {
     public class ArchiveCygwinTar : AbstractBuildStep {
 
-        public static string TarPath = @"C:\cygwin\bin\tar.exe";
-        public static string GzipPath = @"C:\cygwin\bin\gzip.exe";
+        public static string TarPath = @"C:\cygwin64\bin\tar.exe";
+        public static string GzipPath = @"C:\cygwin64\bin\gzip.exe";
 
         private readonly string _directoryToArchive;
         private readonly string _outputPath;

diff --git a/Examples~/Unity Build Scripting Test Project/Packages/manifest.json b/Examples~/Unity Build Scripting Test Project/Packages/manifest.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "com.10101software.buildscripting": "file:../../..",
-    "com.unity.ide.rider": "1.2.1",
-    "com.unity.ide.visualstudio": "2.0.16",
+    "com.unity.ide.rider": "3.0.24",
+    "com.unity.ide.visualstudio": "2.0.20",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.modules.imgui": "1.0.0",
     "com.unity.modules.jsonserialize": "1.0.0",

diff --git a/Examples~/Unity Build Scripting Test Project/Packages/packages-lock.json b/Examples~/Unity Build Scripting Test Project/Packages/packages-lock.json
@@ -8,22 +8,22 @@
     },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
-      "depth": 2,
+      "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "1.2.1",
+      "version": "3.0.24",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.test-framework": "1.1.1"
+        "com.unity.ext.nunit": "1.0.6"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.16",
+      "version": "2.0.20",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -39,7 +39,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.31",
+      "version": "1.1.33",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -72,6 +72,7 @@
       "depth": 0,
       "source": "builtin",
       "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       }

diff --git a/Examples~/Unity Build Scripting Test Project/ProjectSettings/MemorySettings.asset b/Examples~/Unity Build Scripting Test Project/ProjectSettings/MemorySettings.asset
@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!387306366 &1
+MemorySettings:
+  m_ObjectHideFlags: 0
+  m_EditorMemorySettings:
+    m_MainAllocatorBlockSize: -1
+    m_ThreadAllocatorBlockSize: -1
+    m_MainGfxBlockSize: -1
+    m_ThreadGfxBlockSize: -1
+    m_CacheBlockSize: -1
+    m_TypetreeBlockSize: -1
+    m_ProfilerBlockSize: -1
+    m_ProfilerEditorBlockSize: -1
+    m_BucketAllocatorGranularity: -1
+    m_BucketAllocatorBucketsCount: -1
+    m_BucketAllocatorBlockSize: -1
+    m_BucketAllocatorBlockCount: -1
+    m_ProfilerBucketAllocatorGranularity: -1
+    m_ProfilerBucketAllocatorBucketsCount: -1
+    m_ProfilerBucketAllocatorBlockSize: -1
+    m_ProfilerBucketAllocatorBlockCount: -1
+    m_TempAllocatorSizeMain: -1
+    m_JobTempAllocatorBlockSize: -1
+    m_BackgroundJobTempAllocatorBlockSize: -1
+    m_JobTempAllocatorReducedBlockSize: -1
+    m_TempAllocatorSizeGIBakingWorker: -1
+    m_TempAllocatorSizeNavMeshWorker: -1
+    m_TempAllocatorSizeAudioWorker: -1
+    m_TempAllocatorSizeCloudWorker: -1
+    m_TempAllocatorSizeGfx: -1
+    m_TempAllocatorSizeJobWorker: -1
+    m_TempAllocatorSizeBackgroundWorker: -1
+    m_TempAllocatorSizePreloadManager: -1
+  m_PlatformMemorySettings: {}