Run macOS CI on goldengate with Xcode_swift_6.4

.github/jobs/GradleJob.pkl

@@ -45,6 +45,9 @@ fixed job {
     when (os == "windows") {
       ["JAVA_HOME"] = "/jdk"
     }
+    when (os == "macOS") {
+      ["DEVELOPER_DIR"] = "/Applications/Xcode_swift_6.4.app"
+    }
   }
   when (os == "macOS") {
     `if` =
@@ -65,10 +68,7 @@ fixed job {
       new Listing {
         "self-hosted"
         "macos"
-        // Currently have a bug where macOS runners have `cc` from XCode 26 toolchain but have
+        "goldengate"
-        // default SDK set to 27.
-        // TODO remove me once this issue is fixed.
-        "tahoe"
         when (nightlyMacOS) {
           "nightly"
         }

.github/workflows/build.yml

@@ -321,9 +321,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:
@@ -660,9 +661,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:
@@ -999,9 +1001,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:

.github/workflows/main.yml

@@ -319,9 +319,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:
@@ -658,9 +659,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:
@@ -997,9 +999,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:

.github/workflows/prb.yml

@@ -211,9 +211,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:
@@ -559,9 +560,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:
@@ -907,9 +909,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:

.github/workflows/release-branch.yml

@@ -319,9 +319,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:
@@ -658,9 +659,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:
@@ -997,9 +999,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:

.github/workflows/release.yml

@@ -322,9 +322,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:
@@ -666,9 +667,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:
@@ -1010,9 +1012,10 @@ jobs:
     runs-on:
     - self-hosted
     - macos
-    - tahoe
+    - goldengate
     env:
       LANG: en_US.UTF-8
+      DEVELOPER_DIR: /Applications/Xcode_swift_6.4.app
     steps:
     - uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
       with:

build-logic/src/main/kotlin/NativeImageBuild.kt

@@ -279,8 +279,12 @@ abstract class NativeImageBuild : DefaultTask() {
           add("--native-compiler-path=${nativeCompilerPath.get().asFile}")
         }
         // Pass through all `HOMEBREW_` prefixed environment variables to allow build with shimmed
-        // tools.
+        // tools, and `DEVELOPER_DIR` so that `cc` on macOS uses the selected Xcode toolchain.
-        addAll(environment.keys.filter { it.startsWith("HOMEBREW_") }.map { "-E$it" })
+        addAll(
+          environment.keys
+            .filter { it.startsWith("HOMEBREW_") || it == "DEVELOPER_DIR" }
+            .map { "-E$it" }
+        )
         addAll(extraNativeImageArgs.get())
         addAll(extraArgsFromProperties)
       }