Merge pull request #7 from VeyronSakai/build-workflow

Fix Build workflow
VeyronSakai · Apr 26, 2024 · f69928f · f69928f
2 parents 042819d + 9eacd65
commit f69928f
Show file tree

Hide file tree

Showing 12 changed files with 123 additions and 49 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -0,0 +1,61 @@
+name: BuildTest
+on:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      clean:
+        type: boolean
+        default: false
+        description: "clean"
+
+env:
+  CLEAN: ${{ github.event.inputs.clean || false }}
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  android:
+    runs-on: [self-hosted, macOS]
+    steps:
+      - name: Switch workspace
+        uses: DeNA/setup-job-workspace-action@fea4ef4d011492fe235833241acbb4fced82da27
+      - uses: actions/checkout@v4
+        with:
+          clean: "${{ env.CLEAN }}"
+      - name: Get Unity version
+        run: |
+          echo "UNITY_VERSION=$(grep "m_EditorVersion:" < ProjectSettings/ProjectVersion.txt | cut -d" " -f2)" >> "${GITHUB_ENV}"
+      - name: Android Build
+        env:
+          ANDROID_NDK_ROOT: "/Applications/Unity/Hub/Editor/${UNITY_VERSION}/PlaybackEngines/AndroidPlayer/NDK"
+        run: |
+          /Applications/Unity/Hub/Editor/"${UNITY_VERSION}"/Unity.app/Contents/MacOS/Unity \
+            -quit \
+            -batchmode \
+            -nographics \
+            -projectPath "$(pwd)" \
+            -executeMethod Editor.BuildEntryPoint.BuildAndroid
+
+  ios:
+    runs-on: [self-hosted, macOS]
+    steps:
+      - name: Switch workspace
+        uses: DeNA/setup-job-workspace-action@fea4ef4d011492fe235833241acbb4fced82da27
+      - uses: actions/checkout@v4
+        with:
+          clean: "${{ env.CLEAN }}"
+      - name: Get Unity version
+        run: |
+          echo "UNITY_VERSION=$(grep "m_EditorVersion:" < ProjectSettings/ProjectVersion.txt | cut -d" " -f2)" >> "${GITHUB_ENV}"
+      - name: iOS Build
+        env:
+          ANDROID_NDK_ROOT: "/Applications/Unity/Hub/Editor/${UNITY_VERSION}/PlaybackEngines/AndroidPlayer/NDK"
+        run: |
+          /Applications/Unity/Hub/Editor/"${UNITY_VERSION}"/Unity.app/Contents/MacOS/Unity \
+            -quit \
+            -batchmode \
+            -nographics \
+            -projectPath "$(pwd)" \
+            -executeMethod Editor.BuildEntryPoint.BuildIOS \
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/Assets/Editor.meta b/Assets/Editor.meta
diff --git a/Assets/Editor/BuildEntryPoint.cs b/Assets/Editor/BuildEntryPoint.cs
@@ -0,0 +1,36 @@
+using UnityEditor;
+
+namespace Editor
+{
+    // ReSharper disable once UnusedMember.Global
+    public sealed class BuildEntryPoint
+    {
+        // ReSharper disable once UnusedMember.Global
+        public static void BuildAndroid()
+        {
+            var buildPlayerOptions = new BuildPlayerOptions
+            {
+                scenes = new[] { "Assets/Scenes/SampleScene.unity" },
+                locationPathName = "Outputs/Android/app.apk",
+                target = BuildTarget.Android,
+                options = BuildOptions.Development,
+            };
+
+            BuildPipeline.BuildPlayer(buildPlayerOptions);
+        }
+
+        // ReSharper disable once UnusedMember.Global
+        public static void BuildIOS()
+        {
+            var buildPlayerOptions = new BuildPlayerOptions
+            {
+                scenes = new[] { "Assets/Scenes/SampleScene.unity" },
+                locationPathName = "Outputs/IOS/",
+                target = BuildTarget.iOS,
+                options = BuildOptions.Development,
+            };
+
+            BuildPipeline.BuildPlayer(buildPlayerOptions);
+        }
+    }
+}
diff --git a/Assets/Editor/BuildEntryPoint.cs.meta b/Assets/Editor/BuildEntryPoint.cs.meta
diff --git a/...GhaUnityBuildReporter/Editor/Bootstrap.cs → ...ldReporter/Editor/EditorQuitEntryPoint.cs b/...GhaUnityBuildReporter/Editor/Bootstrap.cs → ...ldReporter/Editor/EditorQuitEntryPoint.cs
@@ -6,14 +6,14 @@
 namespace GhaUnityBuildReporter.Editor
 {
     [InitializeOnLoad]
-    internal sealed class Bootstrap
+    internal sealed class EditorQuitEntryPoint
     {
         internal static bool ExecutesUnityBuild;
         private static readonly string s_gitHubStepSummaryPath;
 
         // The 'report' argument passed to IPolsstprocessBuildWithReport.OnPostprocessBuild() contains incorrect information, so read Library/LastBuild.buildreport instead.
         // see: https://issuetracker.unity3d.com/issues/buildreport-report-in-ipostprocessbuildwithreport-provides-incorrect-information
-        static Bootstrap()
+        static EditorQuitEntryPoint()
         {
             s_gitHubStepSummaryPath = EnvironmentVariableRepository.GetGitHubStepSummaryPath();
 

diff --git a/...ityBuildReporter/Editor/Bootstrap.cs.meta → ...orter/Editor/EditorQuitEntryPoint.cs.meta b/...ityBuildReporter/Editor/Bootstrap.cs.meta → ...orter/Editor/EditorQuitEntryPoint.cs.meta
diff --git a/Assets/GhaUnityBuildReporter/Editor/EnvironmentVariableRepository.cs b/Assets/GhaUnityBuildReporter/Editor/EnvironmentVariableRepository.cs
@@ -15,20 +15,17 @@ internal sealed class EnvironmentVariableRepository
 
         internal static string GetGitHubStepSummaryPath()
         {
-            Debug.Log($"{GitHubStepSummary}: {Environment.GetEnvironmentVariable(GitHubStepSummary)}");
             return Environment.GetEnvironmentVariable(GitHubStepSummary);
         }
 
         internal static bool IsGitHubActions()
         {
-            Debug.Log($"{GitHubActions}: {Environment.GetEnvironmentVariable(GitHubActions)}");
             return Environment.GetEnvironmentVariable(GitHubActions) == True;
         }
 
         internal static bool IsDisabled()
         {
             var envVar = Environment.GetEnvironmentVariable(GhaUnityBuildReporterOptOut);
-            Debug.Log($"{GhaUnityBuildReporterOptOut}: {envVar}");
             return envVar?.ToLower() is True or "1";
         }
     }

diff --git a/Assets/GhaUnityBuildReporter/Editor/Preprocessor.cs b/Assets/GhaUnityBuildReporter/Editor/Preprocessor.cs
@@ -17,7 +17,7 @@ public void OnPreprocessBuild(BuildReport report)
                 return;
             }
 
-            Bootstrap.ExecutesUnityBuild = true;
+            EditorQuitEntryPoint.ExecutesUnityBuild = true;
         }
     }
 }
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -8,7 +8,7 @@
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.7.6",
     "com.unity.ugui": "1.0.0",
-    "com.unity.visualscripting": "1.9.2",
+    "com.unity.visualscripting": "1.9.4",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -210,7 +210,7 @@
       }
     },
     "com.unity.visualscripting": {
-      "version": "1.9.2",
+      "version": "1.9.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.25f1
-m_EditorVersionWithRevision: 2022.3.25f1 (530ae0ba3889)
+m_EditorVersion: 2022.3.26f1
+m_EditorVersionWithRevision: 2022.3.26f1 (ec6cd8118806)
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ public void OnPreprocessBuild(BuildReport report) @@
                     return;
                 }
-                Bootstrap.ExecutesUnityBuild = true;
+                EditorQuitEntryPoint.ExecutesUnityBuild = true;
             }
         }
     }