From 4a9dada16a5fc99962bd6f79ae50e091335d6588 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Mon, 1 Jun 2026 17:36:33 +0200 Subject: [PATCH 1/3] disable lightmapping --- .github/workflows/ci.yml | 31 ++++++++----------- .github/workflows/create-unity-matrix.yml | 3 +- .../Editor/Builder.cs | 13 -------- .../Scenes/Test.unity | 2 +- 4 files changed, 16 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1cfee42fd..3070713a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,13 +35,8 @@ jobs: sdk: strategy: matrix: + # TEMP: only building macOS native SDKs while debugging the macOS lightmapper failure include: - - target: Android - host: ubuntu-latest - - target: Linux - host: ubuntu-latest - - target: Windows - host: windows-latest - target: Cocoa host: macos-latest - target: MacOSNative @@ -122,7 +117,7 @@ jobs: # A Linux, docker-based build to prepare a WebGL player. The tests run in `test-run-webgl`. test-build-webgl: name: Build ${{ matrix.platform }} ${{ matrix.unity-version }} Test - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-create, create-unity-matrix] runs-on: ubuntu-latest strategy: @@ -261,7 +256,7 @@ jobs: test-build-android: name: Build Android ${{ matrix.unity-version }} Test - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-create, create-unity-matrix] secrets: inherit strategy: @@ -273,7 +268,7 @@ jobs: test-run-android: name: Run Android ${{ matrix.unity-version }} Integration Test - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-build-android, create-unity-matrix] secrets: inherit uses: ./.github/workflows/test-run-android.yml @@ -291,7 +286,7 @@ jobs: test-build-ios: name: Build iOS ${{ matrix.unity-version }} Test - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-create, create-unity-matrix] secrets: inherit strategy: @@ -303,7 +298,7 @@ jobs: test-compile-ios: name: Compile iOS ${{ matrix.unity-version }} Test - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-build-ios, create-unity-matrix] secrets: inherit strategy: @@ -318,7 +313,7 @@ jobs: test-run-ios: name: Run iOS ${{ matrix.unity-version }} Integration Test - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-compile-ios, create-unity-matrix] uses: ./.github/workflows/test-run-ios.yml with: @@ -344,7 +339,7 @@ jobs: test-run-webgl: name: Run WebGL ${{ matrix.unity-version }} Integration Test - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-build-webgl, create-unity-matrix] secrets: inherit strategy: @@ -357,7 +352,7 @@ jobs: test-build-linux: name: Build Linux ${{ matrix.unity-version }} Integration Test - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-create, create-unity-matrix] secrets: inherit strategy: @@ -370,7 +365,7 @@ jobs: test-build-windows: name: Build Windows ${{ matrix.unity-version }} Integration Test - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-create, create-unity-matrix] secrets: inherit strategy: @@ -396,7 +391,7 @@ jobs: test-run-linux: name: Run Linux ${{ matrix.unity-version }} Integration Test - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-build-linux, create-unity-matrix] secrets: inherit strategy: @@ -410,7 +405,7 @@ jobs: test-run-windows: name: Run Windows ${{ matrix.unity-version }} Integration Test - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-build-windows, create-unity-matrix] secrets: inherit strategy: @@ -441,7 +436,7 @@ jobs: build-size-summary: name: Build Size runs-on: ubuntu-latest - if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} + if: false # TEMP: disabled while debugging macOS lightmapper failure needs: [test-build-webgl, test-build-android, test-compile-ios, test-build-linux, test-build-windows, test-build-macos] steps: - name: Checkout diff --git a/.github/workflows/create-unity-matrix.yml b/.github/workflows/create-unity-matrix.yml index 42271f1f3..9b0a84a59 100644 --- a/.github/workflows/create-unity-matrix.yml +++ b/.github/workflows/create-unity-matrix.yml @@ -14,7 +14,8 @@ on: env: # Unity versions used in PRs - PR_UNITY_VERSIONS: '["2022.3", "6000.0", "6000.3"]' + # TEMP: targeting only 2021.3 to debug macOS lightmapper failure + PR_UNITY_VERSIONS: '["2021.3"]' # Unity versions used on main branch FULL_UNITY_VERSIONS: '["2021.3", "2022.3", "6000.0", "6000.3"]' diff --git a/test/Scripts.Integration.Test/Editor/Builder.cs b/test/Scripts.Integration.Test/Editor/Builder.cs index 1e16b7407..dd138ed6a 100644 --- a/test/Scripts.Integration.Test/Editor/Builder.cs +++ b/test/Scripts.Integration.Test/Editor/Builder.cs @@ -28,7 +28,6 @@ public static void BuildIl2CPPPlayer(BuildTarget target, BuildTargetGroup group, PlayerSettings.runInBackground = true; DisableUnityAudio(); - DisableProgressiveLightMapper(); Debug.Log("Builder: Setting IL2CPP generation to OptimizeSpeed"); #if UNITY_2022_1_OR_NEWER @@ -250,16 +249,4 @@ private static void DisableUnityAudio() prop.boolValue = true; serializedManager.ApplyModifiedProperties(); } - - // The Progressive Lightmapper does not work on silicone CPUs and there is no GPU in CI - private static void DisableProgressiveLightMapper() - { -#if UNITY_2021_1_OR_NEWER - Lightmapping.lightingSettings = new LightingSettings - { - bakedGI = false, - realtimeGI = false - }; -#endif - } } diff --git a/test/Scripts.Integration.Test/Scenes/Test.unity b/test/Scripts.Integration.Test/Scenes/Test.unity index 2806c2b8e..84dbf045e 100644 --- a/test/Scripts.Integration.Test/Scenes/Test.unity +++ b/test/Scripts.Integration.Test/Scenes/Test.unity @@ -51,7 +51,7 @@ LightmapSettings: m_IndirectOutputScale: 1 m_AlbedoBoost: 1 m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 + m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: serializedVersion: 12 From ad8347b75c7f824691b7ecf7ce6b33e68280ff1c Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Tue, 2 Jun 2026 10:53:05 +0200 Subject: [PATCH 2/3] upsi --- .github/workflows/ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3070713a8..ea547e295 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,8 +35,13 @@ jobs: sdk: strategy: matrix: - # TEMP: only building macOS native SDKs while debugging the macOS lightmapper failure include: + - target: Android + host: ubuntu-latest + - target: Linux + host: ubuntu-latest + - target: Windows + host: windows-latest - target: Cocoa host: macos-latest - target: MacOSNative From 1a5e01986ecd7c0ed0663b30eecfa372f57e2524 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Tue, 2 Jun 2026 11:37:22 +0200 Subject: [PATCH 3/3] skip 2021 for macOS --- .github/workflows/ci.yml | 32 ++++++++++++------- .github/workflows/create-unity-matrix.yml | 3 +- .../Editor/Builder.cs | 13 ++++++++ .../Scenes/Test.unity | 2 +- 4 files changed, 35 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ea547e295..fd0b0199e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -122,7 +122,7 @@ jobs: # A Linux, docker-based build to prepare a WebGL player. The tests run in `test-run-webgl`. test-build-webgl: name: Build ${{ matrix.platform }} ${{ matrix.unity-version }} Test - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-create, create-unity-matrix] runs-on: ubuntu-latest strategy: @@ -261,7 +261,7 @@ jobs: test-build-android: name: Build Android ${{ matrix.unity-version }} Test - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-create, create-unity-matrix] secrets: inherit strategy: @@ -273,7 +273,7 @@ jobs: test-run-android: name: Run Android ${{ matrix.unity-version }} Integration Test - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-build-android, create-unity-matrix] secrets: inherit uses: ./.github/workflows/test-run-android.yml @@ -291,7 +291,7 @@ jobs: test-build-ios: name: Build iOS ${{ matrix.unity-version }} Test - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-create, create-unity-matrix] secrets: inherit strategy: @@ -303,7 +303,7 @@ jobs: test-compile-ios: name: Compile iOS ${{ matrix.unity-version }} Test - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-build-ios, create-unity-matrix] secrets: inherit strategy: @@ -318,7 +318,7 @@ jobs: test-run-ios: name: Run iOS ${{ matrix.unity-version }} Integration Test - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-compile-ios, create-unity-matrix] uses: ./.github/workflows/test-run-ios.yml with: @@ -344,7 +344,7 @@ jobs: test-run-webgl: name: Run WebGL ${{ matrix.unity-version }} Integration Test - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-build-webgl, create-unity-matrix] secrets: inherit strategy: @@ -357,7 +357,7 @@ jobs: test-build-linux: name: Build Linux ${{ matrix.unity-version }} Integration Test - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-create, create-unity-matrix] secrets: inherit strategy: @@ -370,7 +370,7 @@ jobs: test-build-windows: name: Build Windows ${{ matrix.unity-version }} Integration Test - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-create, create-unity-matrix] secrets: inherit strategy: @@ -390,13 +390,17 @@ jobs: fail-fast: false matrix: unity-version: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix).unity-version }} + # The progressive lightmapper requires a GPU, which the Apple silicon CI runners don't have. + # On Unity 2021 this fails the player build outright (instead of warning), so skip macOS 2021.3. + exclude: + - unity-version: "2021.3" uses: ./.github/workflows/test-build-macos.yml with: unity-version: ${{ matrix.unity-version }} test-run-linux: name: Run Linux ${{ matrix.unity-version }} Integration Test - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-build-linux, create-unity-matrix] secrets: inherit strategy: @@ -410,7 +414,7 @@ jobs: test-run-windows: name: Run Windows ${{ matrix.unity-version }} Integration Test - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-build-windows, create-unity-matrix] secrets: inherit strategy: @@ -432,6 +436,10 @@ jobs: matrix: unity-version: ${{ fromJSON(needs.create-unity-matrix.outputs.unity-matrix).unity-version }} backend: ["cocoa", "native"] + # See test-build-macos: the progressive lightmapper needs a GPU the Apple silicon + # CI runners lack, which fails the Unity 2021 player build. Skip macOS 2021.3. + exclude: + - unity-version: "2021.3" uses: ./.github/workflows/test-run-desktop.yml with: unity-version: ${{ matrix.unity-version }} @@ -441,7 +449,7 @@ jobs: build-size-summary: name: Build Size runs-on: ubuntu-latest - if: false # TEMP: disabled while debugging macOS lightmapper failure + if: ${{ !startsWith(github.ref, 'refs/heads/release/') }} needs: [test-build-webgl, test-build-android, test-compile-ios, test-build-linux, test-build-windows, test-build-macos] steps: - name: Checkout diff --git a/.github/workflows/create-unity-matrix.yml b/.github/workflows/create-unity-matrix.yml index 9b0a84a59..42271f1f3 100644 --- a/.github/workflows/create-unity-matrix.yml +++ b/.github/workflows/create-unity-matrix.yml @@ -14,8 +14,7 @@ on: env: # Unity versions used in PRs - # TEMP: targeting only 2021.3 to debug macOS lightmapper failure - PR_UNITY_VERSIONS: '["2021.3"]' + PR_UNITY_VERSIONS: '["2022.3", "6000.0", "6000.3"]' # Unity versions used on main branch FULL_UNITY_VERSIONS: '["2021.3", "2022.3", "6000.0", "6000.3"]' diff --git a/test/Scripts.Integration.Test/Editor/Builder.cs b/test/Scripts.Integration.Test/Editor/Builder.cs index dd138ed6a..1e16b7407 100644 --- a/test/Scripts.Integration.Test/Editor/Builder.cs +++ b/test/Scripts.Integration.Test/Editor/Builder.cs @@ -28,6 +28,7 @@ public static void BuildIl2CPPPlayer(BuildTarget target, BuildTargetGroup group, PlayerSettings.runInBackground = true; DisableUnityAudio(); + DisableProgressiveLightMapper(); Debug.Log("Builder: Setting IL2CPP generation to OptimizeSpeed"); #if UNITY_2022_1_OR_NEWER @@ -249,4 +250,16 @@ private static void DisableUnityAudio() prop.boolValue = true; serializedManager.ApplyModifiedProperties(); } + + // The Progressive Lightmapper does not work on silicone CPUs and there is no GPU in CI + private static void DisableProgressiveLightMapper() + { +#if UNITY_2021_1_OR_NEWER + Lightmapping.lightingSettings = new LightingSettings + { + bakedGI = false, + realtimeGI = false + }; +#endif + } } diff --git a/test/Scripts.Integration.Test/Scenes/Test.unity b/test/Scripts.Integration.Test/Scenes/Test.unity index 84dbf045e..2806c2b8e 100644 --- a/test/Scripts.Integration.Test/Scenes/Test.unity +++ b/test/Scripts.Integration.Test/Scenes/Test.unity @@ -51,7 +51,7 @@ LightmapSettings: m_IndirectOutputScale: 1 m_AlbedoBoost: 1 m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 + m_EnableBakedLightmaps: 1 m_EnableRealtimeLightmaps: 0 m_LightmapEditorSettings: serializedVersion: 12