Skip to content

Commit 404d014

Browse files
committed
Update CI and tests
Signed-off-by: Luis Padron <heyluispadron@gmail.com>
1 parent b65ce61 commit 404d014

File tree

4 files changed

+6
-16
lines changed

4 files changed

+6
-16
lines changed

examples/integration/MODULE.bazel

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ use_repo(
5050
"local_config_apple_cc_toolchains",
5151
)
5252

53-
# TODO: Remove manual register once https://github.com/bazelbuild/rules_cc/commit/c8c38f8c710cbbf834283e4777916b68261b359c is released
54-
register_toolchains("@local_config_apple_cc_toolchains//:all")
55-
5653
non_module_deps = use_extension(":repositories.bzl", "non_module_deps")
5754
use_repo(
5855
non_module_deps,

examples/rules_ios/MODULE.bazel

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ bazel_dep(
2020
)
2121
bazel_dep(
2222
name = "rules_ios",
23-
version = "5.5.1",
23+
version = "5.6.0",
2424
repo_name = "build_bazel_rules_ios",
2525
)
2626

@@ -33,6 +33,3 @@ use_repo(
3333
"local_config_apple_cc",
3434
"local_config_apple_cc_toolchains",
3535
)
36-
37-
# TODO: Remove manual register once https://github.com/bazelbuild/rules_cc/commit/c8c38f8c710cbbf834283e4777916b68261b359c is released
38-
register_toolchains("@local_config_apple_cc_toolchains//:all")

examples/rules_ios/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
22

33
http_archive(
44
name = "build_bazel_rules_ios",
5-
sha256 = "c417b69639a737eb44e2af13309f1b00950d6d0c48f67c64ee36d3ea750f687e",
6-
url = "https://github.com/bazel-ios/rules_ios/releases/download/4.6.0/rules_ios.4.6.0.tar.gz",
5+
sha256 = "e0dbd18f1d7a48a4b98e97dbdc45dfc7f0b1cf902afe86c442614db17f560611",
6+
url = "https://github.com/bazel-ios/rules_ios/releases/download/5.6.0/rules_ios.5.6.0.tar.gz",
77
)
88

99
load(

test/update_all_fixtures.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,13 @@ for dir in examples/*/ ; do
1010
continue
1111
fi
1212

13+
# TODO: rules_ios only supports up-to Bazel 7.x
1314
if [[ "$dir" == "examples/rules_ios/" ]]; then
14-
bazel_version="7.4.1"
15-
else
16-
# See https://github.com/MobileNativeFoundation/rules_xcodeproj/pull/3029
17-
#
18-
# Temporary change to make CI pass until the fix is in `last_green`
19-
bazel_version="dd2464a5933e0a5a6765024573832717b71989bf"
15+
overriden_bazel_version="7.4.1"
2016
fi
2117

2218
echo
2319
echo "Updating \"${dir%/}\" fixtures"
2420
echo
25-
USE_BAZEL_VERSION="$bazel_version" bazel run --config=cache //test/fixtures:update
21+
USE_BAZEL_VERSION="${overriden_bazel_version:-}" bazel run --config=cache //test/fixtures:update
2622
done

0 commit comments

Comments
 (0)