From 22e90e0eab05a924a51dc6fa183b2d82efa30963 Mon Sep 17 00:00:00 2001
From: Kathryn Baldauf <k_baldauf@apple.com>
Date: Thu, 18 Jun 2026 10:12:56 -0700
Subject: [PATCH] Pin xcode swift version in CI to 6.3 (#1746)

CI runners moved to the Xcode developer beta as the default, but macOS
builds are failing with a conflicting options error for
-warnings-as-errors and -suppress-warnings. Matches
https://github.com/apple/containerization/pull/771

Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
Co-authored-by: J Logan <john_logan@apple.com>
---
 .github/workflows/common.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index c3d6e5b7..48452488 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -28,6 +28,8 @@ jobs:
     permissions:
       contents: read
       packages: read
+    env:
+      DEVELOPER_DIR: "/Applications/Xcode_swift_6.3.app/Contents/Developer"
     steps:
       - name: Checkout repository
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
@@ -55,8 +57,6 @@ jobs:
             git diff --name-only -- .
             false
           fi
-        env:
-          DEVELOPER_DIR: "/Applications/Xcode_swift_6.3.app/Contents/Developer"
 
       - name: Set build configuration
         env:
@@ -71,8 +71,6 @@ jobs:
         run: |
           make container dsym docs
           tar cfz _site.tgz _site
-        env:
-          DEVELOPER_DIR: "/Applications/Xcode_swift_6.3.app/Contents/Developer"
 
       - name: Validate coverage inputs
         if: ${{ inputs.coverage }}
@@ -106,14 +104,10 @@ jobs:
       - name: Test the container project
         if: ${{ !inputs.coverage }}
         run: make APP_ROOT="${APP_ROOT}" LOG_ROOT="${LOG_ROOT}" test install-kernel integration
-        env:
-          DEVELOPER_DIR: "/Applications/Xcode_swift_6.3.app/Contents/Developer"
 
       - name: Test the container project with coverage
         if: ${{ inputs.coverage }}
         run: make APP_ROOT="${APP_ROOT}" LOG_ROOT="${LOG_ROOT}" install-kernel coverage
-        env:
-          DEVELOPER_DIR: "/Applications/Xcode_swift_6.3.app/Contents/Developer"
 
       - name: Extract coverage percentages
         if: ${{ inputs.coverage }}