Skip to content

Commit 65e7cbf

Browse files
Kyle-YeKyle-Ye
authored
Update toolchains for Xcode 26.6 and Swift 6.3.3 (#234)
* Update CI toolchain versions * Require Xcode 26.6 runner labels * Update DarwinPrivateFrameworks and Tuist * Remove redundant Swift version comments * Update tuist config * Update DPF
1 parent 49a4009 commit 65e7cbf

20 files changed

Lines changed: 53 additions & 59 deletions

‎.github/workflows/compatibility_tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ jobs:
1717
matrix:
1818
include:
1919
- os: macos-15
20-
xcode-version: "26.3" # Swift 6.2.4
21-
runs-on: ${{ matrix.os }}
20+
xcode-version: "26.6" # Swift 6.3.3
21+
runs-on:
22+
- ${{ matrix.os }}
23+
- xcode-26.6
2224
env:
2325
OPENATTRIBUTEGRAPH_WERROR: 1
2426
OPENATTRIBUTEGRAPH_COMPATIBILITY_TEST: 1
@@ -49,9 +51,7 @@ jobs:
4951
shell: bash
5052
- name: Run tests against Apple's AttributeGraph on macOS via SwiftPM
5153
run: |
52-
# Swift 6.2.4 crashes while indexing C++ interop test targets.
5354
swift test \
54-
--disable-index-store \
5555
--build-path .build-compatibility-test-debug
5656
- name: Run tests against Apple's AttributeGraph on macOS via Xcode
5757
run: |

‎.github/workflows/compute.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
# Swift 6.2.4 crashes swift-frontend when compiling C++ interop on Linux.
16-
# Swift 6.3.2 has been verified locally on Linux.
17-
swift_version: ["6.3.2"]
15+
swift_version: ["6.3.3"]
1816
runs-on: ubuntu-22.04
1917
env:
2018
OPENATTRIBUTEGRAPH_WERROR: 1
@@ -37,8 +35,10 @@ jobs:
3735
fail-fast: false
3836
matrix:
3937
os: [macos-15]
40-
xcode-version: ["26.3"]
41-
runs-on: ${{ matrix.os }}
38+
xcode-version: ["26.6"]
39+
runs-on:
40+
- ${{ matrix.os }}
41+
- xcode-26.6
4242
env:
4343
OPENATTRIBUTEGRAPH_WERROR: 1
4444
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1
@@ -63,12 +63,14 @@ jobs:
6363
fail-fast: false
6464
matrix:
6565
os: [macos-15]
66-
xcode-version: ["26.3"]
66+
xcode-version: ["26.6"]
6767
ios-version: ["18.5"]
6868
include:
6969
- ios-version: "18.5"
7070
ios-simulator-name: "iPhone 16 Pro"
71-
runs-on: ${{ matrix.os }}
71+
runs-on:
72+
- ${{ matrix.os }}
73+
- xcode-26.6
7274
env:
7375
OPENATTRIBUTEGRAPH_WERROR: 1
7476
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_COMPUTE: 1

‎.github/workflows/ios.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [macos-15]
19-
xcode-version: ["26.3"] # Swift 6.2.4
19+
xcode-version: ["26.6"] # Swift 6.3.3
2020
ios-version: ["18.5"]
2121
include:
2222
- ios-version: "18.5"
2323
ios-simulator-name: "iPhone 16 Pro"
24-
runs-on: ${{ matrix.os }}
24+
runs-on:
25+
- ${{ matrix.os }}
26+
- xcode-26.6
2527
env:
2628
OPENATTRIBUTEGRAPH_WERROR: 1
2729
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
@@ -52,7 +54,6 @@ jobs:
5254
- name: Build in debug mode on iOS
5355
run: |
5456
source Scripts/Tuist/common.sh
55-
# Swift 6.2.4 crashes while indexing C++ interop test targets.
5657
tuist_xcodebuild \
5758
"${RUNNER_TEMP:-/tmp}/openattributegraph-ios-build-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT:-0}.xcresult" \
5859
build \
@@ -63,12 +64,10 @@ jobs:
6364
-derivedDataPath .build-debug \
6465
-skipMacroValidation \
6566
-skipPackagePluginValidation \
66-
COMPILER_INDEX_STORE_ENABLE=NO \
6767
OTHER_SWIFT_FLAGS="-warnings-as-errors"
6868
- name: Build and run tests in debug mode with coverage on iOS Simulator
6969
run: |
7070
source Scripts/Tuist/common.sh
71-
# Swift 6.2.4 crashes while indexing C++ interop test targets.
7271
tuist_xcodebuild \
7372
"${RUNNER_TEMP:-/tmp}/openattributegraph-ios-test-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT:-0}.xcresult" \
7473
test \
@@ -79,8 +78,7 @@ jobs:
7978
-enableCodeCoverage=YES \
8079
-derivedDataPath .build-test-debug \
8180
-skipPackagePluginValidation \
82-
-skipMacroValidation \
83-
COMPILER_INDEX_STORE_ENABLE=NO
81+
-skipMacroValidation
8482
# OTHER_SWIFT_FLAGS="-warnings-as-errors" Conflicting options '-warnings-as-errors' and '-suppress-warnings'
8583
- name: Generate iOS coverage report
8684
run: |

‎.github/workflows/macos.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
os: [macos-15]
16-
xcode-version: ["26.3"] # Swift 6.2.4
17-
runs-on: ${{ matrix.os }}
16+
xcode-version: ["26.6"] # Swift 6.3.3
17+
runs-on:
18+
- ${{ matrix.os }}
19+
- xcode-26.6
1820
env:
1921
OPENATTRIBUTEGRAPH_WERROR: 1
2022
OPENATTRIBUTEGRAPH_USE_LOCAL_DEPS: 1
@@ -34,9 +36,7 @@ jobs:
3436
shell: bash
3537
- name: Build and run tests in debug mode with coverage
3638
run: |
37-
# Swift 6.2.4 crashes while indexing C++ interop test targets.
3839
swift test \
39-
--disable-index-store \
4040
-c debug \
4141
--enable-code-coverage \
4242
--build-path .build-test-debug
@@ -46,9 +46,7 @@ jobs:
4646
> coverage.txt
4747
- name: Build and run tests in release mode
4848
run: |
49-
# Swift 6.2.4 crashes while indexing C++ interop test targets.
5049
swift test \
51-
--disable-index-store \
5250
-c release \
5351
--enable-code-coverage \
5452
--build-path .build-test-release

‎.github/workflows/oag_binary.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
os: [macos-15]
16-
xcode-version: ["26.3"]
17-
runs-on: ${{ matrix.os }}
16+
xcode-version: ["26.6"]
17+
runs-on:
18+
- ${{ matrix.os }}
19+
- xcode-26.6
1820
env:
1921
OPENATTRIBUTEGRAPH_WERROR: 1
2022
OPENATTRIBUTEGRAPH_OPENATTRIBUTESHIMS_OAG_USE_BINARY: 1

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ on:
88
jobs:
99
release:
1010
name: Build and Publish Release
11-
runs-on: macos-15
11+
runs-on:
12+
- macos-15
13+
- xcode-26.6
1214
permissions:
1315
contents: write
1416
id-token: write
@@ -22,7 +24,7 @@ jobs:
2224
- name: Setup Xcode
2325
uses: OpenSwiftUIProject/setup-xcode@v2
2426
with:
25-
xcode-version: "26.3"
27+
xcode-version: "26.6"
2628
- name: Set up mise
2729
uses: jdx/mise-action@v2
2830
with:

‎.github/workflows/ubuntu.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
# Swift 6.2.4 crashes swift-frontend when compiling C++ interop tests on Linux.
16-
# Swift 6.3.2 has been verified locally on Linux.
17-
swift_version: ["6.3.2"]
15+
swift_version: ["6.3.3"]
1816
runs-on: ubuntu-22.04
1917
env:
2018
OPENATTRIBUTEGRAPH_WERROR: 1

‎.github/workflows/xcframework.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [macos-15]
19-
xcode-version: ["26.3"] # Swift 6.2.4
20-
runs-on: ${{ matrix.os }}
19+
xcode-version: ["26.6"] # Swift 6.3.3
20+
runs-on:
21+
- ${{ matrix.os }}
22+
- xcode-26.6
2123
env:
2224
GH_TOKEN: ${{ github.token }}
2325
steps:

‎Example/Project.swift‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
import ProjectDescription
22

3-
let indexStoreDisabledSettings: SettingsDictionary = [
4-
// Swift 6.2.4 crashes while indexing C++ interop package targets.
5-
"COMPILER_INDEX_STORE_ENABLE": "NO",
6-
]
7-
83
let project = Project(
94
name: "Example",
10-
settings: .settings(base: indexStoreDisabledSettings),
115
targets: [
126
.target(
137
name: "Example",
@@ -19,8 +13,7 @@ let project = Project(
1913
dependencies: [
2014
.sdk(name: "c++", type: .library),
2115
.external(name: "OpenAttributeGraph"),
22-
],
23-
settings: .settings(base: indexStoreDisabledSettings)
16+
]
2417
),
2518
]
2619
)

‎Example/Tuist.swift‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,12 @@ let tuist = Tuist(
77
),
88
project: .tuist(
99
generationOptions: .options(
10-
enableCaching: Environment.isCI
10+
optionalAuthentication: true,
11+
enableCaching: Environment.isCI,
12+
manifestEnvironment: [
13+
"OPENSWIFTUI_*",
14+
"OPENATTRIBUTEGRAPH_*",
15+
]
1116
)
1217
)
1318
)

0 commit comments

Comments
 (0)