Skip to content

Commit eeb7adf

Browse files
Update dependencies and Xcode (#75)
- Update Bazel ruleset dependencies - Update CI to Xcode 16.2 and iOS 18.2 simulators - Update CI to macOS 15 from macOS 14 (needed to find 18.2 simulators, currently macOS 14 issue) - Create default test runner with specific device since rules_apple uses default `iPhone 12` that's not present on default CI VMs --------- Signed-off-by: Matt Robinson <[email protected]>
1 parent e0439dd commit eeb7adf

File tree

8 files changed

+24
-13
lines changed

8 files changed

+24
-13
lines changed

.bazelrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ build:remote_cache --nolegacy_important_outputs
6262
#
6363
# https://bazel.build/reference/command-line-reference#flag--bes_upload_mode
6464
build:remote_cache --bes_upload_mode=nowait_for_upload_complete
65-
build:ci --bes_upload_mode=wait_for_upload_complete
6665

6766
# By default don't upload local results to remote cache, only CI does this.
6867
build --noremote_upload_local_results

.github/workflows/tests.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ concurrency:
1414
jobs:
1515
tests:
1616
name: Build and Test
17-
runs-on: macos-14
18-
environment: CI
17+
runs-on: macos-15
1918
steps:
2019
- uses: actions/checkout@v3
2120
- name: Set Up CI

.github/workflows/xcode_select.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ echo "Selecting Xcode for environment"
55
printenv
66

77
sudo xcode-select -p
8-
sudo xcode-select -s /Applications/Xcode_15.2.app
8+
sudo xcode-select -s /Applications/Xcode_16.2.app
9+
10+
echo "Printing available simulators"
11+
12+
xcrun simctl list devices
913

1014
echo "Generating bazelrc"
1115

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
22
bazel_dep(name = "rules_xcodeproj", version = "2.10.0")
33
bazel_dep(
44
name = "apple_support",
5-
version = "1.17.0",
5+
version = "1.17.1",
66
repo_name = "build_bazel_apple_support",
77
)
88
bazel_dep(
99
name = "rules_swift",
10-
version = "2.3.1",
10+
version = "2.4.0",
1111
repo_name = "build_bazel_rules_swift",
1212
)
1313
bazel_dep(
1414
name = "rules_apple",
15-
version = "3.16.1",
15+
version = "3.17.0",
1616
repo_name = "build_bazel_rules_apple",
1717
)
1818

modules/API/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
22
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
3-
load("//tools:shared.bzl", "default_test_runner", "versions")
3+
load("//tools:shared.bzl", "versions")
44

55
# Code
66

@@ -33,7 +33,7 @@ swift_library(
3333
ios_unit_test(
3434
name = "APITests",
3535
minimum_os_version = versions.minimum_ios_version,
36+
runner = "//tools:default_test_runner",
3637
visibility = ["//modules:default_test_visibility"],
3738
deps = [":APITestsLib"],
38-
runner = default_test_runner,
3939
)

modules/Models/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("@build_bazel_rules_apple//apple:ios.bzl", "ios_unit_test")
22
load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
3-
load("//tools:shared.bzl", "default_test_runner", "versions")
3+
load("//tools:shared.bzl", "versions")
44

55
# Code
66

@@ -30,7 +30,7 @@ swift_library(
3030
ios_unit_test(
3131
name = "ModelsTests",
3232
minimum_os_version = versions.minimum_ios_version,
33+
runner = "//tools:default_test_runner",
3334
visibility = ["//modules:default_test_visibility"],
3435
deps = [":ModelsTestsLib"],
35-
runner = default_test_runner,
3636
)

tools/BUILD.bazel

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
load(
2+
"@build_bazel_rules_apple//apple/testing/default_runner:ios_xctestrun_runner.bzl",
3+
"ios_xctestrun_runner",
4+
)
5+
6+
ios_xctestrun_runner(
7+
name = "default_test_runner",
8+
device_type = "iPhone 16",
9+
random = True,
10+
visibility = ["//visibility:public"],
11+
)

tools/shared.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,3 @@ app_info = struct(
77
versions = struct(
88
minimum_ios_version = "18.0",
99
)
10-
11-
default_test_runner = Label("@build_bazel_rules_apple//apple/testing/default_runner:ios_xctestrun_random_runner")

0 commit comments

Comments
 (0)