Skip to content

Commit 2c3065f

Browse files
committed
Remove ubuntu18 as rules_proto absiel version doesn't support it
1 parent 711a98f commit 2c3065f

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.bazelci/presubmit.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22
matrix:
33
unittest_platform:
44
- ubuntu2004
5-
- ubuntu1804
65
integration_platform:
76
- ubuntu2004
8-
- ubuntu1804
97
# - macos
108
# - windows re-enable when rules_bazel_integration_test can support custom test runner on windows.
119
test_flags:
@@ -35,7 +33,8 @@ tasks:
3533
- "--config=rbe"
3634
test_targets:
3735
- //examples:all
38-
rbe_ubuntu1604:
36+
rbe:
37+
platform: ${{ unittest_platform }}
3938
test_targets:
4039
- "--"
4140
- "//src/test/kotlin/io/bazel/kotlin/builder:builder_tests"
@@ -50,7 +49,7 @@ tasks:
5049
- "--strategy=KotlinCompile=remote"
5150
stardoc:
5251
name: Stardoc api documentation
53-
platform: ubuntu1804
52+
platform: ubuntu2004
5453
build_flags:
5554
- "--enable_bzlmod=true"
5655
build_targets:
@@ -59,7 +58,7 @@ tasks:
5958
- //docs:are_docs_up_to_date_test
6059
ktlint:
6160
name: KtLint
62-
platform: ubuntu1804
61+
platform: ubuntu2004
6362
test_targets:
6463
- //...
6564
test_flags:

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ maven.override(
9999
use_repo(maven, "kotlin_rules_maven", "unpinned_kotlin_rules_maven")
100100

101101
bazel_dep(name = "rules_pkg", version = "1.0.1")
102+
bazel_dep(name = "rules_proto", version = "7.0.2")
102103
bazel_dep(name = "stardoc", version = "0.7.2", repo_name = "io_bazel_stardoc")
103-
bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
104104

105105
bazel_dep(name = "rules_testing", version = "0.5.0", dev_dependency = True)
106106
bazel_dep(name = "rules_bazel_integration_test", version = "0.25.0", dev_dependency = True)

0 commit comments

Comments
 (0)