Skip to content

Commit c6a6534

Browse files
authored
Fix last_green bazel support (#1606)
1 parent 65dbe7a commit c6a6534

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.bazelci/presubmit.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ tasks:
6868

6969
macos_last_green:
7070
name: "Last Green Bazel"
71-
# TODO: Move back to last_green once rules_cc imports are fixed
72-
bazel: 5b1f4bc6fb7d29746c9886a450e1fba1f9b8982a
71+
bazel: last_green
7372
<<: *mac_common
7473

7574
macos_latest_head_deps:
@@ -113,8 +112,7 @@ tasks:
113112

114113
ubuntu2204_last_green:
115114
name: "Last Green Bazel"
116-
# TODO: Move back to last_green once rules_cc imports are fixed
117-
bazel: 5b1f4bc6fb7d29746c9886a450e1fba1f9b8982a
115+
bazel: last_green
118116
shell_commands:
119117
- "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
120118
- "mkdir $SWIFT_HOME"

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bazel_dep(name = "rules_cc", version = "0.2.14")
1515
bazel_dep(name = "rules_shell", version = "0.3.0")
1616
bazel_dep(name = "platforms", version = "0.0.11")
1717
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
18-
bazel_dep(name = "nlohmann_json", version = "3.12.0", repo_name = "com_github_nlohmann_json")
18+
bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1", repo_name = "com_github_nlohmann_json")
1919
bazel_dep(
2020
name = "swift_argument_parser",
2121
version = "1.3.1.2",
@@ -46,7 +46,7 @@ register_toolchains("@build_bazel_rules_swift_local_config//:all")
4646
# Dev dependencies
4747
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
4848
bazel_dep(name = "gazelle", version = "0.46.0", dev_dependency = True, repo_name = "bazel_gazelle")
49-
bazel_dep(name = "rules_go", version = "0.58.3", dev_dependency = True) # TODO: Remove when transitives update past this version
49+
bazel_dep(name = "rules_go", version = "0.59.0", dev_dependency = True) # TODO: Remove when transitives update past this version
5050
bazel_dep(name = "stardoc", version = "0.7.1", dev_dependency = True, repo_name = "io_bazel_stardoc")
5151

5252
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

0 commit comments

Comments
 (0)