Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 31 additions & 8 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@
test_targets:
- //examples:all

.integration_tests_no_android: &integration_tests_no_android
name: "Integration Tests (no android)"
platform: ${{ platform.name }}
test_flags: ${{ integration_shard_flags }}
test_targets:
- //examples:all
# See https://github.com/bazelbuild/rules_android_ndk/issues/107
- "-//examples:android"
- "-//examples:jetpack_compose"
# Not related to android, but fails on windows with
# cl : Command line error D8022 : cannot open 'bazel-out/x64_windows-opt-exec-ST-a828a81199fe/bin/external/
# com_google_protobuf/src/google/protobuf/compiler/_objs/code_generator_lite/code_generator_lite.obj.params'
- "-//examples:deps"

# Common platform configurations.
.ubuntu2404: &ubuntu2404
platform: ubuntu2404
Expand All @@ -33,14 +47,19 @@
environment:
ANDROID_NDK_HOME: /Users/buildkite/android-ndk-r25b

.windows: &windows
platform: windows
environment:
ANDROID_NDK_HOME: C:\android_ndk\r25b

# bazelci pipeline
matrix:
integration_shard_flags:
- ["--test_tag_filters=shard_0"]
- ["--test_tag_filters=shard_1"]
- ["--test_tag_filters=shard_2"]
- [ "--test_tag_filters=shard_0" ]
- [ "--test_tag_filters=shard_1" ]
- [ "--test_tag_filters=shard_2" ]
test_flags:
- ["--enable_bzlmod=true"]
- [ "--enable_bzlmod=true" ]
validate_config: 1
bazel: 8.4.2
buildifier:
Expand All @@ -52,13 +71,17 @@ tasks:
macos_unittests:
<<: [ *macos, *unittests ]
ubuntu2404_unittests:
<<: [*ubuntu2404, *unittests]
<<: [ *ubuntu2404, *unittests ]
ubuntu2404_integration_tests:
<<: [*ubuntu2404, *integration_tests]
<<: [ *ubuntu2404, *integration_tests ]
ubuntu2204_unittests:
<<: [*ubuntu2204, *unittests]
<<: [ *ubuntu2204, *unittests ]
ubuntu2204_integration_tests:
<<: [*ubuntu2204, *integration_tests]
<<: [ *ubuntu2204, *integration_tests ]
windows_integration_tests:
<<: [ *windows, *integration_tests_no_android ]
windows_unittests:
<<: [ *windows, *unittests ]
rbe_ubuntu2404:
test_targets:
- "--"
Expand Down
6 changes: 6 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
common --enable_platform_specific_config

common --enable_bzlmod=true
common --incompatible_use_plus_in_repo_names
common --incompatible_disallow_empty_glob=false
Expand All @@ -15,6 +17,10 @@ build --verbose_failures
# Required for windows ci
startup --windows_enable_symlinks
common --enable_runfiles
build:windows --cxxopt=/std:c++17
build:windows --host_cxxopt=/std:c++17
build:windows --cxxopt=/Zc:__cplusplus
build:windows --host_cxxopt=/Zc:__cplusplus

# To update these lines, execute
# `bazel run @rules_bazel_integration_test//tools:update_deleted_packages`
Expand Down
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ use_repo(android_sdk_repository_extension, "androidsdk")

register_toolchains("@androidsdk//:all")

bazel_dep(name = "bazel_features", version = "1.25.0")
bazel_dep(name = "bazel_features", version = "1.39.0")
bazel_dep(name = "bazel_lib", version = "3.1.0")
bazel_dep(name = "rules_shell", version = "0.4.1")
bazel_dep(name = "bazel_worker_api", version = "0.0.8")
bazel_dep(name = "bazel_worker_java", version = "0.0.8")
Expand Down Expand Up @@ -135,7 +136,6 @@ use_repo(maven, "kotlin_rules_maven", "unpinned_kotlin_rules_maven")
bazel_dep(name = "rules_pkg", version = "1.0.1")

bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True, repo_name = "io_bazel_stardoc")
bazel_dep(name = "aspect_bazel_lib", version = "2.22.0", dev_dependency = True)
bazel_dep(name = "rules_testing", version = "0.9.0", dev_dependency = True)
bazel_dep(name = "rules_bazel_integration_test", version = "0.34.0", dev_dependency = True)

Expand Down
3 changes: 2 additions & 1 deletion MODULE.release.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ bazel_dep(name = "platforms", version = "0.0.11")
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_java", version = "8.9.0")
bazel_dep(name = "rules_android", version = "0.6.4")
bazel_dep(name = "bazel_features", version = "1.25.0")
bazel_dep(name = "bazel_features", version = "1.39.0")
bazel_dep(name = "bazel_lib", version = "3.1.0")
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
bazel_dep(name = "rules_proto", version = "6.0.2", repo_name = "rules_proto")
bazel_dep(name = "abseil-py", version = "2.1.0", repo_name = "py_absl")
Expand Down
2 changes: 1 addition & 1 deletion docs/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@aspect_bazel_lib//lib:write_source_files.bzl", "write_source_files")
load("@bazel_lib//lib:write_source_files.bzl", "write_source_files")
load("@io_bazel_stardoc//stardoc:stardoc.bzl", "stardoc")

[
Expand Down
18 changes: 18 additions & 0 deletions examples/android/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,24 @@ http_archive(
urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
)

http_archive(
name = "bazel_features",
sha256 = versions.BAZEL_FEATURES.sha256,
strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
)

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

http_archive(
name = "bazel_lib",
sha256 = versions.BAZEL_LIB.sha256,
strip_prefix = versions.BAZEL_LIB.strip_prefix_template.format(version = versions.BAZEL_LIB.version),
urls = [url.format(version = versions.BAZEL_LIB.version) for url in versions.BAZEL_LIB.url_templates],
)

# Android rules dependencies
load("@rules_android//:prereqs.bzl", "rules_android_prereqs")

Expand Down
18 changes: 18 additions & 0 deletions examples/anvil/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,24 @@ http_archive(
urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
)

http_archive(
name = "bazel_features",
sha256 = versions.BAZEL_FEATURES.sha256,
strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
)

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

http_archive(
name = "bazel_lib",
sha256 = versions.BAZEL_LIB.sha256,
strip_prefix = versions.BAZEL_LIB.strip_prefix_template.format(version = versions.BAZEL_LIB.version),
urls = [url.format(version = versions.BAZEL_LIB.version) for url in versions.BAZEL_LIB.url_templates],
)

# Android rules dependencies
load("@rules_android//:prereqs.bzl", "rules_android_prereqs")

Expand Down
18 changes: 18 additions & 0 deletions examples/associates/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,24 @@ http_archive(
urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
)

http_archive(
name = "bazel_features",
sha256 = versions.BAZEL_FEATURES.sha256,
strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
)

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

http_archive(
name = "bazel_lib",
sha256 = versions.BAZEL_LIB.sha256,
strip_prefix = versions.BAZEL_LIB.strip_prefix_template.format(version = versions.BAZEL_LIB.version),
urls = [url.format(version = versions.BAZEL_LIB.version) for url in versions.BAZEL_LIB.url_templates],
)

kotlin_repositories()

##### rules_java setup for rules_android #####
Expand Down
18 changes: 18 additions & 0 deletions examples/dagger/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,24 @@ http_archive(
urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
)

http_archive(
name = "bazel_features",
sha256 = versions.BAZEL_FEATURES.sha256,
strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
)

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

http_archive(
name = "bazel_lib",
sha256 = versions.BAZEL_LIB.sha256,
strip_prefix = versions.BAZEL_LIB.strip_prefix_template.format(version = versions.BAZEL_LIB.version),
urls = [url.format(version = versions.BAZEL_LIB.version) for url in versions.BAZEL_LIB.url_templates],
)

kotlin_repositories()

##### rules_java setup for rules_android #####
Expand Down
18 changes: 18 additions & 0 deletions examples/deps/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,24 @@ http_archive(
urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
)

http_archive(
name = "bazel_features",
sha256 = versions.BAZEL_FEATURES.sha256,
strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
)

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

http_archive(
name = "bazel_lib",
sha256 = versions.BAZEL_LIB.sha256,
strip_prefix = versions.BAZEL_LIB.strip_prefix_template.format(version = versions.BAZEL_LIB.version),
urls = [url.format(version = versions.BAZEL_LIB.version) for url in versions.BAZEL_LIB.url_templates],
)

# Android rules dependencies
load("@rules_android//:prereqs.bzl", "rules_android_prereqs")

Expand Down
2 changes: 1 addition & 1 deletion examples/multiplex/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module(name = "multiplex-example")
bazel_dep(name = "rules_java", version = "8.9.0")
bazel_dep(name = "rules_kotlin", version = "1.9.5")
bazel_dep(name = "rules_jvm_external", version = "6.6")
bazel_dep(name = "bazel_features", version = "1.25.0")
bazel_dep(name = "bazel_features", version = "1.39.0")

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
maven.install(
Expand Down
18 changes: 18 additions & 0 deletions examples/plugin/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,24 @@ http_archive(
urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
)

http_archive(
name = "bazel_features",
sha256 = versions.BAZEL_FEATURES.sha256,
strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
)

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

http_archive(
name = "bazel_lib",
sha256 = versions.BAZEL_LIB.sha256,
strip_prefix = versions.BAZEL_LIB.strip_prefix_template.format(version = versions.BAZEL_LIB.version),
urls = [url.format(version = versions.BAZEL_LIB.version) for url in versions.BAZEL_LIB.url_templates],
)

# Android rules dependencies
load("@rules_android//:prereqs.bzl", "rules_android_prereqs")

Expand Down
18 changes: 18 additions & 0 deletions examples/trivial/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,24 @@ http_archive(
urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
)

http_archive(
name = "bazel_features",
sha256 = versions.BAZEL_FEATURES.sha256,
strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
)

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

http_archive(
name = "bazel_lib",
sha256 = versions.BAZEL_LIB.sha256,
strip_prefix = versions.BAZEL_LIB.strip_prefix_template.format(version = versions.BAZEL_LIB.version),
urls = [url.format(version = versions.BAZEL_LIB.version) for url in versions.BAZEL_LIB.url_templates],
)

kotlin_repositories()

##### rules_java setup for rules_android #####
Expand Down
Loading