Skip to content

Commit 50be3cf

Browse files
meringdbaileychess
andauthoredJan 23, 2025
Test external modules explicitly in CI (#8507)
This setup is much simpler than calling Bazel from within Bazel and making sure files and flags are set up correctly. Co-authored-by: Derek Bailey <derekbailey@google.com>
1 parent 026c243 commit 50be3cf

File tree

8 files changed

+16
-149
lines changed

8 files changed

+16
-149
lines changed
 

‎.bazelci/presubmit.yml

+12
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,18 @@ tasks:
3838
- "//..."
3939
test_targets:
4040
- "//..."
41+
test_module_cpp:
42+
platform: ubuntu2204
43+
bazel: ${{ bazel }}
44+
working_directory: tests/bazel_repository_test_dir
45+
build_targets:
46+
- "//..."
47+
test_module_ts:
48+
platform: ubuntu2204
49+
bazel: ${{ bazel }}
50+
working_directory: tests/ts/bazel_repository_test_dir
51+
test_targets:
52+
- "//..."
4153
verify_macos:
4254
platform: macos
4355
bazel: ${{ bazel }}

‎.bazelignore

+4
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
ts/node_modules
2+
3+
# Test workspaces
4+
tests/bazel_repository_test_dir
5+
tests/ts/bazel_repository_test_dir

‎MODULE.bazel

-14
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,3 @@ use_repo(node, "nodejs_linux_amd64")
7171
rules_ts_ext = use_extension("@aspect_rules_ts//ts:extensions.bzl", "ext")
7272
rules_ts_ext.deps()
7373
use_repo(rules_ts_ext, "npm_typescript")
74-
75-
bazel_dep(
76-
name = "rules_bazel_integration_test",
77-
version = "0.31.0",
78-
dev_dependency = True,
79-
)
80-
81-
bazel_binaries = use_extension(
82-
"@rules_bazel_integration_test//:extensions.bzl",
83-
"bazel_binaries",
84-
dev_dependency = True,
85-
)
86-
bazel_binaries.download(version = "6.5.0")
87-
use_repo(bazel_binaries, "bazel_binaries", "bazel_binaries_bazelisk", "build_bazel_bazel_6_5_0")

‎WORKSPACE

-20
Original file line numberDiff line numberDiff line change
@@ -190,23 +190,3 @@ esbuild_register_toolchains(
190190
name = "esbuild",
191191
esbuild_version = LATEST_ESBUILD_VERSION,
192192
)
193-
194-
http_archive(
195-
name = "rules_bazel_integration_test",
196-
sha256 = "3e24bc0fba88177cd0ae87c1e37bf7de5d5af8e812f00817a58498b1a8368fca",
197-
urls = [
198-
"https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.31.0/rules_bazel_integration_test.v0.31.0.tar.gz",
199-
],
200-
)
201-
202-
load("@rules_bazel_integration_test//bazel_integration_test:deps.bzl", "bazel_integration_test_rules_dependencies")
203-
204-
bazel_integration_test_rules_dependencies()
205-
206-
load("@cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies")
207-
208-
bazel_starlib_dependencies()
209-
210-
load("@rules_bazel_integration_test//bazel_integration_test:defs.bzl", "bazel_binaries")
211-
212-
bazel_binaries(versions = ["6.5.0"])

‎tests/BUILD.bazel

-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
22
load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
33
load("//:build_defs.bzl", "DEFAULT_FLATC_ARGS", "flatbuffer_cc_library")
4-
load(":defs.bzl", "flatbuffers_as_external_repo_test")
54

65
package(default_visibility = ["//visibility:private"])
76

@@ -269,8 +268,3 @@ flatbuffer_cc_library(
269268
name = "alignment_test_cc_fbs",
270269
srcs = ["alignment_test.fbs"],
271270
)
272-
273-
flatbuffers_as_external_repo_test(
274-
name = "bazel_repository_test",
275-
directory = "bazel_repository_test_dir",
276-
)

‎tests/bazel_repository_test_template.sh

-29
This file was deleted.

‎tests/defs.bzl

-74
This file was deleted.

‎tests/ts/BUILD.bazel

-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
load("@aspect_rules_js//js:defs.bzl", "js_test")
22
load("@aspect_rules_js//npm:defs.bzl", "npm_link_package")
33
load("//:typescript.bzl", "flatbuffer_ts_library")
4-
load("//tests:defs.bzl", "flatbuffers_as_external_repo_test")
54

65
package(default_visibility = ["//visibility:private"])
76

@@ -61,8 +60,3 @@ TEST_COMPLEX_ARRAYS_DATA = glob([
6160
#("JavaScriptFlexBuffersTest", TBD_DATA)
6261
("JavaScriptComplexArraysTest", TEST_COMPLEX_ARRAYS_DATA),
6362
)]
64-
65-
flatbuffers_as_external_repo_test(
66-
name = "bazel_repository_test",
67-
directory = "bazel_repository_test_dir",
68-
)

0 commit comments

Comments
 (0)