diff --git a/.github/scripts/audience/matrix-shared.json b/.github/scripts/audience/matrix-shared.json index f96114f3..5110371c 100644 --- a/.github/scripts/audience/matrix-shared.json +++ b/.github/scripts/audience/matrix-shared.json @@ -4,7 +4,7 @@ { "version": "6000.4.0f1", "changeset": "8cf496087c8f" }, { "version": "2022.3.62f2", "changeset": "7670c08855a9" } ], - "scripting_backends": ["IL2CPP", "Mono2x"], + "scripting_backends": ["IL2CPP"], "desktop_targets": [ { "target": "StandaloneWindows64", "runner": ["self-hosted", "Windows", "X64"], "install_unity_script": ".github/scripts/audience/install-unity-windows.ps1", "run_playmode_script": ".github/scripts/audience/playmode-windows.ps1" }, { "target": "StandaloneOSX", "runner": ["self-hosted", "macOS", "ARM64"], "install_unity_script": ".github/scripts/audience/install-unity-macos.sh", "run_playmode_script": ".github/scripts/audience/playmode-macos.sh" }, diff --git a/.github/workflows/test-audience-sample-app.yml b/.github/workflows/test-audience-sample-app.yml index ee985b21..a27bbff8 100644 --- a/.github/workflows/test-audience-sample-app.yml +++ b/.github/workflows/test-audience-sample-app.yml @@ -1,4 +1,4 @@ -name: Audience SDK PlayMode (IL2CPP + Mono) +name: Audience SDK PlayMode (IL2CPP) on: pull_request: @@ -454,13 +454,8 @@ jobs: return total; } - function apkSize(dir) { - const apk = fs.readdirSync(dir).find(f => f.endsWith('.apk')); - return apk ? fs.statSync(path.join(dir, apk)).size : 0; - } - const measured = { - Android: apkSize('artifacts/Android'), + Android: dirSize('artifacts/Android'), Windows: dirSize('artifacts/Windows'), iOS: dirSize('artifacts/iOS'), macOS: dirSize('artifacts/macOS'), diff --git a/examples/audience/Assets/Editor/AndroidBuilder.cs b/examples/audience/Assets/Editor/AndroidBuilder.cs index a0eb77ce..0a3e15fe 100644 --- a/examples/audience/Assets/Editor/AndroidBuilder.cs +++ b/examples/audience/Assets/Editor/AndroidBuilder.cs @@ -21,6 +21,12 @@ public static void Build() { string buildPath = GetArgValue("--buildPath") ?? DefaultBuildPath; + // Force a direct APK output. exportAsGoogleAndroidProject outputs a Gradle project + // directory and buildAppBundle outputs a .aab — either causes the *.apk glob in CI + // to find nothing and report 0 bytes. + EditorUserBuildSettings.exportAsGoogleAndroidProject = false; + EditorUserBuildSettings.buildAppBundle = false; + var options = new BuildPlayerOptions { scenes = new[] { "Assets/SampleApp/Scenes/SampleApp.unity" },