Skip to content

Commit 3d72237

Browse files
authored
chore: upgrade GitHub runners to macos-15 (#1533)
Primary goal: Upgrade to `maco-15` to use the latest versions of Xcode. Other changes: - Simplified some examples to make them easier to maintain. - Redefined `//config_settings/spm/platform` config settings to not match on `apple_platform_type`. - Ran `swift package update` on most examples. #1541 - Add runner to `ios_unit_test`.
1 parent bea63de commit 3d72237

File tree

208 files changed

+4063
-8988
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+4063
-8988
lines changed

.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# To update these lines, execute
22
# `bazel run @rules_bazel_integration_test//tools:update_deleted_packages`
3-
build --deleted_packages=bzlmod/workspace,bzlmod/workspace/Sources/MyExecutable,bzlmod/workspace/Sources/MyLibrary,bzlmod/workspace/Tests/MyLibraryTests,examples/firebase_example,examples/firebase_example/abtesting,examples/firebase_example/abtesting/SharedApp,examples/firebase_example/analytics/AnalyticsExample,examples/firebase_example/appdistribution,examples/firebase_example/appdistribution/AppDistributionExample,examples/firebase_example/appdistribution/AppDistributionTests,examples/firebase_example/crashlytics,examples/google_maps_example,examples/google_maps_example/GoogleMapsExample,examples/google_maps_example/third-party/google-maps-ios-sdk,examples/grpc_example,examples/grpc_example/aaa_test,examples/grpc_example/protos,examples/grpc_example/protos/echo_service,examples/grpc_example/protos/echo_service/requests,examples/grpc_example/protos/echo_service/responses,examples/grpc_example/sources,examples/grpc_example/sources/client,examples/grpc_example/sources/server,examples/grpc_example/sources/test,examples/grpc_package_example,examples/grpc_package_example/aaa_test,examples/grpc_package_example/protos,examples/grpc_package_example/protos/echo_service,examples/grpc_package_example/sources,examples/grpc_package_example/sources/client,examples/grpc_package_example/sources/server,examples/grpc_package_example/sources/test,examples/interesting_deps,examples/interesting_deps/ios,examples/ios_sim,examples/ios_sim/Sources/Foo,examples/ios_sim/Tests/FooTests,examples/ios_sim/third-party/swift-cmark,examples/lottie_ios_example,examples/lottie_ios_example/LottieExample,examples/lottie_ios_example/LottieExampleUITest,examples/messagekit_example,examples/messagekit_example/Sources,examples/messagekit_example/UITests,examples/nimble_example,examples/nimble_example/Sources/NimbleExample,examples/objc_code,examples/phone_number_kit,examples/phone_number_kit/Tests/PhoneNumberKitTests,examples/pkg_manifest_minimal,examples/pkg_manifest_minimal/Sources/MyExecutable,examples/pkg_manifest_minimal/Sources/MyLibrary,examples/pkg_manifest_minimal/Tests/MyLibraryTests,examples/pkg_manifest_minimal/third_party,examples/resources_example,examples/resources_example/Sources/MyApp,examples/resources_example/Tests/MyAppTests,examples/resources_example/Tests/MyAppUITests,examples/resources_example/third_party,examples/shake_ios_example,examples/shake_ios_example/ShakeIOSExample,examples/shake_ios_example/ShakeIOSExampleUITests,examples/skip_local_transitive_dependencies_example,examples/snapkit_example,examples/soto_example,examples/soto_example/Tests/SotoTests,examples/stripe_example,examples/stripe_example/PaymentSheet/PaymentSheetExample,examples/stripe_example/PaymentSheet/PaymentSheetUITest,examples/swift_package_registry_example,examples/symlink_example,examples/symlink_example/Sources/ImportFramework,examples/symlink_example/Tests/ImportFrameworkTests,examples/tca_example,examples/tca_example/Sources,examples/tca_example/Tests,examples/vapor_example,examples/vapor_example/Sources/App,examples/vapor_example/Sources/Run,examples/vapor_example/Tests/AppTests,examples/vapor_example/swift,examples/xcmetrics_example
4-
query --deleted_packages=bzlmod/workspace,bzlmod/workspace/Sources/MyExecutable,bzlmod/workspace/Sources/MyLibrary,bzlmod/workspace/Tests/MyLibraryTests,examples/firebase_example,examples/firebase_example/abtesting,examples/firebase_example/abtesting/SharedApp,examples/firebase_example/analytics/AnalyticsExample,examples/firebase_example/appdistribution,examples/firebase_example/appdistribution/AppDistributionExample,examples/firebase_example/appdistribution/AppDistributionTests,examples/firebase_example/crashlytics,examples/google_maps_example,examples/google_maps_example/GoogleMapsExample,examples/google_maps_example/third-party/google-maps-ios-sdk,examples/grpc_example,examples/grpc_example/aaa_test,examples/grpc_example/protos,examples/grpc_example/protos/echo_service,examples/grpc_example/protos/echo_service/requests,examples/grpc_example/protos/echo_service/responses,examples/grpc_example/sources,examples/grpc_example/sources/client,examples/grpc_example/sources/server,examples/grpc_example/sources/test,examples/grpc_package_example,examples/grpc_package_example/aaa_test,examples/grpc_package_example/protos,examples/grpc_package_example/protos/echo_service,examples/grpc_package_example/sources,examples/grpc_package_example/sources/client,examples/grpc_package_example/sources/server,examples/grpc_package_example/sources/test,examples/interesting_deps,examples/interesting_deps/ios,examples/ios_sim,examples/ios_sim/Sources/Foo,examples/ios_sim/Tests/FooTests,examples/ios_sim/third-party/swift-cmark,examples/lottie_ios_example,examples/lottie_ios_example/LottieExample,examples/lottie_ios_example/LottieExampleUITest,examples/messagekit_example,examples/messagekit_example/Sources,examples/messagekit_example/UITests,examples/nimble_example,examples/nimble_example/Sources/NimbleExample,examples/objc_code,examples/phone_number_kit,examples/phone_number_kit/Tests/PhoneNumberKitTests,examples/pkg_manifest_minimal,examples/pkg_manifest_minimal/Sources/MyExecutable,examples/pkg_manifest_minimal/Sources/MyLibrary,examples/pkg_manifest_minimal/Tests/MyLibraryTests,examples/pkg_manifest_minimal/third_party,examples/resources_example,examples/resources_example/Sources/MyApp,examples/resources_example/Tests/MyAppTests,examples/resources_example/Tests/MyAppUITests,examples/resources_example/third_party,examples/shake_ios_example,examples/shake_ios_example/ShakeIOSExample,examples/shake_ios_example/ShakeIOSExampleUITests,examples/skip_local_transitive_dependencies_example,examples/snapkit_example,examples/soto_example,examples/soto_example/Tests/SotoTests,examples/stripe_example,examples/stripe_example/PaymentSheet/PaymentSheetExample,examples/stripe_example/PaymentSheet/PaymentSheetUITest,examples/swift_package_registry_example,examples/symlink_example,examples/symlink_example/Sources/ImportFramework,examples/symlink_example/Tests/ImportFrameworkTests,examples/tca_example,examples/tca_example/Sources,examples/tca_example/Tests,examples/vapor_example,examples/vapor_example/Sources/App,examples/vapor_example/Sources/Run,examples/vapor_example/Tests/AppTests,examples/vapor_example/swift,examples/xcmetrics_example
3+
build --deleted_packages=bzlmod/workspace,bzlmod/workspace/Sources/MyExecutable,bzlmod/workspace/Sources/MyLibrary,bzlmod/workspace/Tests/MyLibraryTests,examples/firebase_example,examples/firebase_example/abtesting,examples/firebase_example/abtesting/SharedApp,examples/firebase_example/analytics/AnalyticsExample,examples/firebase_example/appdistribution,examples/firebase_example/appdistribution/AppDistributionExample,examples/firebase_example/appdistribution/AppDistributionTests,examples/firebase_example/crashlytics,examples/google_maps_example,examples/google_maps_example/GoogleMapsExample,examples/google_maps_example/third-party/google-maps-ios-sdk,examples/grpc_example,examples/grpc_example/aaa_test,examples/grpc_example/protos,examples/grpc_example/protos/echo_service,examples/grpc_example/protos/echo_service/requests,examples/grpc_example/protos/echo_service/responses,examples/grpc_example/sources,examples/grpc_example/sources/client,examples/grpc_example/sources/server,examples/grpc_example/sources/test,examples/grpc_package_example,examples/grpc_package_example/aaa_test,examples/grpc_package_example/protos,examples/grpc_package_example/protos/echo_service,examples/grpc_package_example/sources,examples/grpc_package_example/sources/client,examples/grpc_package_example/sources/server,examples/grpc_package_example/sources/test,examples/interesting_deps,examples/interesting_deps/ios,examples/ios_sim,examples/ios_sim/Sources/Foo,examples/ios_sim/Tests/FooTests,examples/lottie_ios_example,examples/lottie_ios_example/LottieExample,examples/lottie_ios_example/LottieExampleUITest,examples/messagekit_example,examples/messagekit_example/Sources/Models,examples/messagekit_example/Tests/ModelTests,examples/nimble_example,examples/nimble_example/Sources/NimbleExample,examples/objc_code,examples/objc_code/Tests/TrustKitTests,examples/phone_number_kit,examples/phone_number_kit/Tests/PhoneNumberKitTests,examples/pkg_manifest_minimal,examples/pkg_manifest_minimal/Sources/MyExecutable,examples/pkg_manifest_minimal/Sources/MyLibrary,examples/pkg_manifest_minimal/Tests/MyLibraryTests,examples/pkg_manifest_minimal/third_party,examples/resources_example,examples/resources_example/Sources/MyApp,examples/resources_example/Tests/MyAppTests,examples/resources_example/Tests/MyAppUITests,examples/resources_example/third_party,examples/shake_ios_example,examples/shake_ios_example/ShakeIOSExample,examples/shake_ios_example/ShakeIOSExampleUITests,examples/skip_local_transitive_dependencies_example,examples/snapkit_example,examples/soto_example,examples/soto_example/Tests/SotoTests,examples/stripe_example,examples/stripe_example/PaymentSheet/PaymentSheetExample,examples/stripe_example/PaymentSheet/PaymentSheetUITest,examples/swift_package_registry_example,examples/symlink_example,examples/symlink_example/Sources/ImportFramework,examples/symlink_example/Tests/ImportFrameworkTests,examples/tca_example,examples/tca_example/Sources,examples/tca_example/Tests,examples/vapor_example,examples/vapor_example/Sources/App,examples/vapor_example/Sources/Run,examples/vapor_example/Tests/AppTests,examples/vapor_example/swift,examples/xcmetrics_example
4+
query --deleted_packages=bzlmod/workspace,bzlmod/workspace/Sources/MyExecutable,bzlmod/workspace/Sources/MyLibrary,bzlmod/workspace/Tests/MyLibraryTests,examples/firebase_example,examples/firebase_example/abtesting,examples/firebase_example/abtesting/SharedApp,examples/firebase_example/analytics/AnalyticsExample,examples/firebase_example/appdistribution,examples/firebase_example/appdistribution/AppDistributionExample,examples/firebase_example/appdistribution/AppDistributionTests,examples/firebase_example/crashlytics,examples/google_maps_example,examples/google_maps_example/GoogleMapsExample,examples/google_maps_example/third-party/google-maps-ios-sdk,examples/grpc_example,examples/grpc_example/aaa_test,examples/grpc_example/protos,examples/grpc_example/protos/echo_service,examples/grpc_example/protos/echo_service/requests,examples/grpc_example/protos/echo_service/responses,examples/grpc_example/sources,examples/grpc_example/sources/client,examples/grpc_example/sources/server,examples/grpc_example/sources/test,examples/grpc_package_example,examples/grpc_package_example/aaa_test,examples/grpc_package_example/protos,examples/grpc_package_example/protos/echo_service,examples/grpc_package_example/sources,examples/grpc_package_example/sources/client,examples/grpc_package_example/sources/server,examples/grpc_package_example/sources/test,examples/interesting_deps,examples/interesting_deps/ios,examples/ios_sim,examples/ios_sim/Sources/Foo,examples/ios_sim/Tests/FooTests,examples/lottie_ios_example,examples/lottie_ios_example/LottieExample,examples/lottie_ios_example/LottieExampleUITest,examples/messagekit_example,examples/messagekit_example/Sources/Models,examples/messagekit_example/Tests/ModelTests,examples/nimble_example,examples/nimble_example/Sources/NimbleExample,examples/objc_code,examples/objc_code/Tests/TrustKitTests,examples/phone_number_kit,examples/phone_number_kit/Tests/PhoneNumberKitTests,examples/pkg_manifest_minimal,examples/pkg_manifest_minimal/Sources/MyExecutable,examples/pkg_manifest_minimal/Sources/MyLibrary,examples/pkg_manifest_minimal/Tests/MyLibraryTests,examples/pkg_manifest_minimal/third_party,examples/resources_example,examples/resources_example/Sources/MyApp,examples/resources_example/Tests/MyAppTests,examples/resources_example/Tests/MyAppUITests,examples/resources_example/third_party,examples/shake_ios_example,examples/shake_ios_example/ShakeIOSExample,examples/shake_ios_example/ShakeIOSExampleUITests,examples/skip_local_transitive_dependencies_example,examples/snapkit_example,examples/soto_example,examples/soto_example/Tests/SotoTests,examples/stripe_example,examples/stripe_example/PaymentSheet/PaymentSheetExample,examples/stripe_example/PaymentSheet/PaymentSheetUITest,examples/swift_package_registry_example,examples/symlink_example,examples/symlink_example/Sources/ImportFramework,examples/symlink_example/Tests/ImportFrameworkTests,examples/tca_example,examples/tca_example/Sources,examples/tca_example/Tests,examples/vapor_example,examples/vapor_example/Sources/App,examples/vapor_example/Sources/Run,examples/vapor_example/Tests/AppTests,examples/vapor_example/swift,examples/xcmetrics_example
55

66
# Import Shared settings
77
import %workspace%/shared.bazelrc

.github/actions/set_up_macos/action.yml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,7 @@ runs:
1414
steps:
1515
- uses: maxim-lobanov/setup-xcode@v1
1616
with:
17-
xcode-version: '15.2'
18-
- name: Override Xcode Version
19-
shell: bash
20-
run: |
21-
# GH762: Investigate why these examples timeout on CI with Xcode 15
22-
if [[ "${{ inputs.test_target }}" = "@@//examples:lottie_ios_example_test_bazel_.bazelversion" ]] ||
23-
[[ "${{ inputs.test_target }}" = "@@//examples:messagekit_example_test_bazel_.bazelversion" ]] ||
24-
[[ "${{ inputs.test_target }}" = "@@//examples:resources_example_test_bazel_.bazelversion" ]] ||
25-
[[ "${{ inputs.test_target }}" = "@@//examples:shake_ios_example_test_bazel_.bazelversion" ]]; then
26-
sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
27-
fi
28-
if [[ "${{ inputs.test_target }}" = "@@//examples:firebase_example_test_bazel_.bazelversion" ]]; then
29-
sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer
30-
fi
17+
xcode-version: '16.2'
3118
- name: Confirm Xcode Version
3219
shell: bash
3320
run: |

.github/workflows/ci.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -34,61 +34,61 @@ jobs:
3434
- test: '@@//bzlmod:e2e_test'
3535
runner: ubuntu-22.04
3636
- test: '@@//bzlmod:e2e_test'
37-
runner: macos-13
37+
runner: macos-15
3838
- test: '@@//examples:firebase_example_test_bazel_.bazelversion'
39-
runner: macos-13
39+
runner: macos-15
4040
- test: '@@//examples:google_maps_example_test_bazel_.bazelversion'
41-
runner: macos-13
41+
runner: macos-15
4242
- test: '@@//examples:grpc_example_test_bazel_.bazelversion'
4343
runner: ubuntu-22.04
4444
- test: '@@//examples:grpc_example_test_bazel_.bazelversion'
45-
runner: macos-13
45+
runner: macos-15
4646
- test: '@@//examples:interesting_deps_test_bazel_.bazelversion'
47-
runner: macos-13
47+
runner: macos-15
4848
- test: '@@//examples:ios_sim_test_bazel_.bazelversion'
49-
runner: macos-13
49+
runner: macos-15
5050
- test: '@@//examples:lottie_ios_example_test_bazel_.bazelversion'
51-
runner: macos-13
51+
runner: macos-15
5252
- test: '@@//examples:messagekit_example_test_bazel_.bazelversion'
53-
runner: macos-13
53+
runner: macos-15
5454
- test: '@@//examples:nimble_example_test_bazel_.bazelversion'
55-
runner: macos-13
55+
runner: macos-15
5656
- test: '@@//examples:objc_code_test_bazel_.bazelversion'
57-
runner: macos-13
57+
runner: macos-15
5858
- test: '@@//examples:phone_number_kit_test_bazel_.bazelversion'
59-
runner: macos-13
59+
runner: macos-15
6060
- test: '@@//examples:pkg_manifest_minimal_test_bazel_.bazelversion'
6161
runner: ubuntu-22.04
6262
- test: '@@//examples:pkg_manifest_minimal_test_bazel_.bazelversion'
63-
runner: macos-13
63+
runner: macos-15
6464
- test: '@@//examples:resources_example_test_bazel_.bazelversion'
65-
runner: macos-13
65+
runner: macos-15
6666
- test: '@@//examples:shake_ios_example_test_bazel_.bazelversion'
67-
runner: macos-13
67+
runner: macos-15
6868
- test: '@@//examples:skip_local_transitive_dependencies_example_test_bazel_.bazelversion'
69-
runner: macos-13
69+
runner: macos-15
7070
- test: '@@//examples:snapkit_example_test_bazel_.bazelversion'
71-
runner: macos-13
71+
runner: macos-15
7272
- test: '@@//examples:soto_example_test_bazel_.bazelversion'
73-
runner: macos-13
73+
runner: macos-15
7474
- test: '@@//examples:stripe_example_test_bazel_.bazelversion'
75-
runner: macos-13
75+
runner: macos-15
7676
- test: '@@//examples:swift_package_registry_example_test_bazel_.bazelversion'
77-
runner: macos-13
77+
runner: macos-15
7878
- test: '@@//examples:symlink_example_test_bazel_.bazelversion'
79-
runner: macos-13
79+
runner: macos-15
8080
- test: '@@//examples:tca_example_test_bazel_.bazelversion'
81-
runner: macos-13
81+
runner: macos-15
8282
- test: '@@//examples:vapor_example_test_bazel_.bazelversion'
8383
runner: ubuntu-22.04
8484
- test: '@@//examples:vapor_example_test_bazel_.bazelversion'
85-
runner: macos-13
85+
runner: macos-15
8686
- test: '@@//examples:xcmetrics_example_test_bazel_.bazelversion'
87-
runner: macos-13
87+
runner: macos-15
8888
- test: '@@//release:archive_test'
8989
runner: ubuntu-22.04
9090
- test: '@@//release:archive_test'
91-
runner: macos-13
91+
runner: macos-15
9292
runs-on: ${{ matrix.runner }}
9393
env:
9494
CC: clang
@@ -116,7 +116,7 @@ jobs:
116116
fail-fast: false
117117
matrix:
118118
runner:
119-
- macos-13
119+
- macos-15
120120
- ubuntu-22.04
121121
runs-on: ${{ matrix.runner }}
122122
env:

bzlmod/workspace/MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ swift_deps.from_package(
5454
use_repo(
5555
swift_deps,
5656
"swift_deps_info",
57+
"swift_package",
5758
"swiftpkg_swift_argument_parser",
5859
"swiftpkg_swift_log",
5960
)

bzlmod/workspace/Package.resolved

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bzlmod/workspace/do_test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ assert_match() {
2222
"${bazel}" test //...
2323

2424
# Run MyExecutable target
25-
output="$("${bazel}" run //Sources/MyExecutable)"
25+
output="$( "${bazel}" run //Sources/MyExecutable 2>&1 )"
2626
assert_match "Hello, World!" "${output}"

0 commit comments

Comments
 (0)