Update to Swift 6.2 (#195)

This PR updates to Swift 6.2 and resolves a build error after updating
to Swift 6.2-snapshot in
apple/containerization#94.

Author: dkovba

.github/workflows/common.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   buildAndTest:
     name: Build and test the project
-    timeout-minutes: 30
+    timeout-minutes: 60
     runs-on: [self-hosted, macos, sequoia, ARM64]
     permissions:
       contents: read
@@ -24,10 +24,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Update containerization
-        run: |
-          /usr/bin/swift package update containerization
-
       - name: Check formatting
         run: |
           ./scripts/install-hawkeye.sh
@@ -47,7 +43,9 @@ jobs:
             git diff --name-only -- .
             false
           fi
-  
+        env:
+          DEVELOPER_DIR: "/Applications/Xcode_26.b1.app/Contents/Developer"
+
       - name: Set build configuration
         run: |
           echo "BUILD_CONFIGURATION=debug" >> $GITHUB_ENV
@@ -60,7 +58,7 @@ jobs:
           make container dsym docs
           tar cfz _site.tgz _site
         env:
-          DEVELOPER_DIR: "/Applications/Xcode_16.3.app/Contents/Developer"
+          DEVELOPER_DIR: "/Applications/Xcode_26.b1.app/Contents/Developer"
 
       - name: Create package
         run: |
@@ -73,7 +71,7 @@ jobs:
           launchctl setenv HTTP_PROXY $HTTP_PROXY
           make test cleancontent install-kernel integration
         env:
-          DEVELOPER_DIR: "/Applications/Xcode_16.3.app/Contents/Developer"
+          DEVELOPER_DIR: "/Applications/Xcode_26.b1.app/Contents/Developer"
           CURRENT_SDK: y # explicitly repeated due to local env block
 
       - name: Save documentation artifact

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.2
 //===----------------------------------------------------------------------===//
 // Copyright © 2025 Apple Inc. and the container project authors. All rights reserved.
 //

Package.swift

@@ -13,18 +13,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+SWIFT="/usr/bin/swift"
+IMAGE_NAME="vminit:latest"
 DESTDIR="${1:-$(git rev-parse --show-toplevel)/bin}"
 mkdir -p "${DESTDIR}"
 
-IMAGE_NAME="vminit:latest"
-
-CONTAINERIZATION_VERSION="${CONTAINERIZATION_VERSION:-$(swift package show-dependencies --format json | jq -r '.dependencies[] | select(.identity == "containerization") | .version')}"
+CONTAINERIZATION_VERSION="${CONTAINERIZATION_VERSION:-$(${SWIFT} package show-dependencies --format json | jq -r '.dependencies[] | select(.identity == "containerization") | .version')}"
 if [ ! -z "${CONTAINERIZATION_PATH}" -o "${CONTAINERIZATION_VERSION}" == "unspecified" ] ; then
-	CONTAINERIZATION_PATH="${CONTAINERIZATION_PATH:-$(swift package show-dependencies --format json | jq -r '.dependencies[] | select(.identity == "containerization") | .path')}"
+	CONTAINERIZATION_PATH="${CONTAINERIZATION_PATH:-$(${SWIFT} package show-dependencies --format json | jq -r '.dependencies[] | select(.identity == "containerization") | .path')}"
 	echo "Creating InitImage"
 	make -C ${CONTAINERIZATION_PATH} init
 	${CONTAINERIZATION_PATH}/bin/cctl images save -o /tmp/init.tar ${IMAGE_NAME}
-	# sleep because commands after stop and start are racy
+	# Sleep because commands after stop and start are racy.
 	bin/container system stop && sleep 3 && bin/container system start && sleep 3
 	bin/container i load -i /tmp/init.tar
 	rm /tmp/init.tar