Skip to content

Use macos-26 and xcode 26.5.0 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
congt merged 3 commits into from
May 29, 2026
Merged

Use macos-26 and xcode 26.5.0 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b88649
Use macos-26 and xcode 26.5.0
congt May 29, 2026
d6fff22
Bumps swift-syntax to 603.0.1
congt May 29, 2026
9f8d012
Fix build failure for swift 6
congt May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
xcode_version:
description: 'The Xcode version to use for building'
required: true
default: '26.3.0'
default: '26.5.0'
type: string
macos_version:
description: 'The minimum macOS version to support'
Expand Down Expand Up @@ -49,7 +49,7 @@ permissions:

jobs:
build-macos-arm64:
runs-on: macos-latest
runs-on: macos-26
env:
TARGET_PLATFORM: macos-arm64
steps:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/dry-run.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ permissions:
contents: read

env:
SWIFT_SYNTAX_VERSION: 602.0.0
XCODE_VERSION: 26.3.0
RULES_SWIFT_VERSION: 3.1.2
SWIFT_SYNTAX_VERSION: 603.0.1
XCODE_VERSION: 26.5.0
RULES_SWIFT_VERSION: 3.6.1
MACOS_VERSION: 13.0
SWIFT_VERSION_LINUX: "6.2"

jobs:
build-macos-arm64:
runs-on: macos-latest
runs-on: macos-26
env:
TARGET_PLATFORM: macos-arm64
steps:
Expand Down
11 changes: 10 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set -euo pipefail
#
# Build phase expects apple/swift-syntax checked out at ./swift-syntax.

APPLE_SUPPORT_VERSION="${APPLE_SUPPORT_VERSION:-1.23.1}"
APPLE_SUPPORT_VERSION="${APPLE_SUPPORT_VERSION:-2.5.4}"
RULES_APPLE_VERSION="${RULES_APPLE_VERSION:-4.2.0}"
MACOS_VERSION="${MACOS_VERSION:-13.0}"

Expand Down Expand Up @@ -115,6 +115,15 @@ bazel_dep(name = "rules_swift", version = "$RULES_SWIFT_VERSION", repo_name = "b
bazel_dep(name = "rules_apple", version = "$RULES_APPLE_VERSION", repo_name = "build_bazel_rules_apple")
EOF

# swift-syntax's BUILD.bazel through 603.0.1 omits SwiftIfConfig
# from SwiftSyntaxMacros' deps even though Package.swift lists it
# and the source `public import`s it. Fixed upstream post-603.0.1
# in 9acadd6e; patch in place so the prebuilt build doesn't fail
# SwiftSyntaxMacros. buildozer exits 3 (no change) if the dep is
# already present -- tolerate that under `set -e`.
# TODO: remove this after swift-syntax 604.0.0 ships.
buildozer "add deps :SwiftIfConfig" //:SwiftSyntaxMacros || [ $? -eq 3 ]

local -a build_flags
build_flags=(
"--@build_bazel_rules_swift//swift:copt=-whole-module-optimization"
Expand Down
Loading