Skip to content

Commit 6a2f186

Browse files
committed
Set ndk to 25b for android_ndk_repository compatibility
1 parent 7ea2909 commit 6a2f186

File tree

1 file changed

+46
-25
lines changed

1 file changed

+46
-25
lines changed

.bazelci/presubmit.yml

Lines changed: 46 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,43 @@
11
---
2+
# Common task configurations.
3+
.unittests: &unittests
4+
build_flags: ${{ test_flags }}
5+
test_flags: ${{ test_flags }}
6+
test_targets:
7+
- "//src/..."
8+
build_targets:
9+
- "//src/..."
10+
11+
.integration_tests: &integration_tests
12+
name: "Integration Tests {}"
13+
platform: ${{ platform.name }}
14+
environment:
15+
ANDROID_NDK_HOME: ${{ platform.android_ndk_home }}
16+
test_targets:
17+
- //examples:all
18+
19+
# Common platform configurations.
20+
.ubuntu2404: &ubuntu2404
21+
platform: ubuntu2404
22+
environment:
23+
ANDROID_NDK_HOME: /opt/android-ndk-r25b
24+
25+
.ubuntu2204: &ubuntu2204
26+
platform: ubuntu2204
27+
environment:
28+
ANDROID_NDK_HOME: /opt/android-ndk-r25b
29+
30+
.macos: &macos
31+
platform: macos
32+
environment:
33+
ANDROID_NDK_HOME: /Users/buildkite/android-ndk-r25b
34+
35+
# bazelci pipeline
236
matrix:
3-
unittest_platform:
4-
- ubuntu2404
5-
- ubuntu2204
6-
integration_platform:
7-
- ubuntu2404
8-
- ubuntu2204
937
integration_shard_flags:
1038
- ["--test_tag_filters=shard_0", "--config=rbe"]
1139
- ["--test_tag_filters=shard_1", "--config=rbe"]
1240
- ["--test_tag_filters=shard_2", "--config=rbe"]
13-
# - macos
14-
# - windows re-enable when rules_bazel_integration_test can support custom test runner on windows.
1541
test_flags:
1642
- ["--enable_bzlmod=true"]
1743
validate_config: 1
@@ -22,21 +48,16 @@ buildifier:
2248
# keep this argument in sync with .pre-commit-config.yaml
2349
warnings: "-confusing-name,-constant-glob,-duplicated-name,-function-docstring,-function-docstring-args,-function-docstring-header,-module-docstring,-name-conventions,-no-effect,-constant-glob,-provider-params,-print,-rule-impl-return,-bzl-visibility,-unnamed-macro,-uninitialized,-unreachable"
2450
tasks:
25-
unittests:
26-
name: "Unit Tests"
27-
platform: ${{ unittest_platform }}
28-
build_flags: ${{ test_flags }}
29-
test_flags: ${{ test_flags }}
30-
test_targets:
31-
- "//src/..."
32-
build_targets:
33-
- "//src/..."
34-
integration_tests:
35-
name: "Integration Tests"
36-
platform: ${{ integration_platform }}
37-
test_flags: ${{ integration_shard_flags }}
38-
test_targets:
39-
- //examples:all
51+
macos_unittests:
52+
<<: [ *macos, *unittests ]
53+
ubuntu2404_unittests:
54+
<<: [*ubuntu2404, *unittests]
55+
ubuntu2404_integration_tests:
56+
<<: [*ubuntu2404, *integration_tests]
57+
ubuntu2204_unittests:
58+
<<: [*ubuntu2204, *unittests]
59+
ubuntu2204_integration_tests:
60+
<<: [*ubuntu2204, *integration_tests]
4061
rbe_ubuntu1604:
4162
test_targets:
4263
- "--"
@@ -52,7 +73,7 @@ tasks:
5273
- "--strategy=KotlinCompile=remote"
5374
stardoc:
5475
name: Stardoc api documentation
55-
platform: ubuntu2404
76+
<<: *ubuntu2404
5677
build_flags:
5778
- "--enable_bzlmod=true"
5879
build_targets:
@@ -61,7 +82,7 @@ tasks:
6182
- //docs:are_docs_up_to_date_test
6283
ktlint:
6384
name: KtLint
64-
platform: ubuntu2404
85+
<<: *ubuntu2404
6586
test_targets:
6687
- //...
6788
test_flags:

0 commit comments

Comments
 (0)