Merge remote-tracking branch 'origin/feature/profile-bundled-sketches…

…' into feature/plugin-scripting
icosa-foundation · Oct 5, 2024 · 815f69a · 815f69a
2 parents c13ee18 + 5427aa6
commit 815f69a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -136,7 +136,7 @@ jobs:
         env:
           PRERELEASE: ${{ steps.version.outputs.prerelease }}
         run: |
-          # For a PR action (i.e., syncronize / open), the value of github.ref will be refs/pull/1234/merge
+          # For a PR action (i.e., synchronize / open), the value of github.ref will be refs/pull/1234/merge
           # For a push action, it will be either refs/heads/foo_branch_name OR refs/tags/v1234.
           # We want to use the base name for pushes of tags or to main, the PR number for PRs, and the branch name for named branches.
           if [[ "$PRERELEASE" == "false" || ${{ github.ref }} == refs/heads/main ]]

diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs
@@ -481,7 +481,7 @@ void DestroyIntroSketch()
             Resources.UnloadUnusedAssets();
         }
 
-        static string GetStartupString()
+        public static string GetStartupString()
         {
             string str = $"{App.kAppDisplayName} {Config.m_VersionNumber}";
 

diff --git a/Assets/Scripts/Debug/ProfilingManager.cs b/Assets/Scripts/Debug/ProfilingManager.cs
@@ -216,6 +216,7 @@ private void OutputStats()
             string branch = GitUtils.GetGitBranchName();
             message.AppendLine($"Git branch: {branch}");
 #endif
+            message.AppendLine($"Build: {App.GetStartupString()}");
             message.AppendLine($"Profile name: {profileName} Filename: {fileName} Human name: {humanName}");
 
             if (App.UserConfig.Profiling.PerfgateOutput)