From 831174c0a4b816d4b73445978f19812bb0c59613 Mon Sep 17 00:00:00 2001
From: BREW <81044362+b-re-w@users.noreply.github.com>
Date: Thu, 5 Nov 2026 07:59:00 +0900
Subject: [PATCH] Fix: Disable Gradle toolchain auto-detect in native-image CI
 so Liberica NIK 25 wins (#251)

---
 .github/workflows/desktop.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml
index cad58b5f..1799d369 100644
--- a/.github/workflows/desktop.yml
+++ b/.github/workflows/desktop.yml
@@ -196,13 +196,15 @@ jobs:
 
       # Records Compose and skiko's configuration against the fork version this run uses, then builds
       # the image and runs it with JAVA_HOME and PYTHONHOME removed: 20 of 20 and no libjvm.
-      # `setup-graalvm` installs Liberica NIK under `GRAALVM_HOME` in the runner toolcache outside
-      # `/Users/runner/hostedtoolcache/Java_*`, so pass `org.gradle.java.installations.paths`
-      # explicitly instead of picking up the runner's pre-installed Temurin 25.
+      # `setup-graalvm` installs Liberica NIK under `GRAALVM_HOME` in the runner toolcache, whereas
+      # macOS runner images also pre-install Temurin 25 in `/Library/Java/JavaVirtualMachines`.
+      # Disable toolchain auto-detection and pass `org.gradle.java.installations.paths="$GRAALVM_HOME"`
+      # so Gradle's JavaLanguageVersion(25) launcher selects Liberica NIK 25 instead of Temurin 25.
       - name: Build and run the native image
         run: >
           ./gradlew :python-multiplatform-compose:fixtures:notebook-e2e:notebookE2eNativeAgent
           :python-multiplatform-compose:fixtures:notebook-e2e:notebookE2eNativeRun
           -PpythonxComposeWheel="$WHEEL_DIR"
+          -Porg.gradle.java.installations.auto-detect=false
           -Porg.gradle.java.installations.paths="$GRAALVM_HOME"
           --console=plain