Skip to content

Commit 6eac655

Browse files
authored
test: remove use of WORKSPACE.bzlmod in tests, prep e2e tests for bazel 8+ (#2705)
### Changes are visible to end-users: no ### Test plan - Covered by existing test cases
1 parent d2a2594 commit 6eac655

File tree

8 files changed

+46
-31
lines changed

8 files changed

+46
-31
lines changed

e2e/gyp_no_install_script/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@ write_source_files(
1717
files = {
1818
"snapshots/segfault-handler_defs.bzl": "@npm__segfault-handler__1.3.0__links//:defs.bzl",
1919
},
20+
tags = [
21+
"skip-on-bazel8",
22+
"skip-on-bazel9",
23+
],
2024
)

e2e/npm_translate_lock_disable_hooks/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@ write_source_files(
1717
"snapshots/defs.bzl": "@npm//:defs.bzl",
1818
"snapshots/aspect_test_c_links_defs.bzl": "@npm__at_aspect-test_c__2.0.0__links//:defs.bzl",
1919
},
20+
tags = [
21+
"skip-on-bazel8",
22+
"skip-on-bazel9",
23+
],
2024
)

e2e/pnpm_lockfiles/lockfile-test.bzl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,4 +247,8 @@ def lockfile_test(npm_link_all_packages, name = None):
247247
for f in BZLMOD_FILES.keys()
248248
],
249249
),
250+
tags = [
251+
"skip-on-bazel8",
252+
"skip-on-bazel9",
253+
],
250254
)

e2e/pnpm_workspace/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,8 @@ write_source_files(
3434
files = {
3535
"snapshots/defs.bzl": "@npm//:defs.bzl",
3636
},
37+
tags = [
38+
"skip-on-bazel8",
39+
"skip-on-bazel9",
40+
],
3741
)

e2e/pnpm_workspace_rerooted/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,8 @@ write_source_files(
3434
files = {
3535
"snapshots/defs.bzl": "@npm//:defs.bzl",
3636
},
37+
tags = [
38+
"skip-on-bazel8",
39+
"skip-on-bazel9",
40+
],
3741
)

e2e/vendored_node/.bazelrc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
import %workspace%/../../tools/preset.bazelrc
22
import %workspace%/../e2e.bazelrc
3-
4-
# TODO: fully migrate to bzlmod
5-
common --enable_workspace

e2e/vendored_node/MODULE.bazel

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,29 @@ bazel_dep(name = "platforms", version = "1.0.0", dev_dependency = True)
88
bazel_dep(name = "rules_nodejs", version = "6.7.3", dev_dependency = True)
99

1010
register_toolchains("//toolchains:all")
11+
12+
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
13+
14+
http_archive(
15+
name = "vendored_node_linux_amd64",
16+
build_file_content = """exports_files(["bin/node"])""",
17+
sha256 = "de2c694e7081c37022817d27a65b02f69ecf4c49699d65585e8e24431b7bc920",
18+
strip_prefix = "node-v16.18.1-linux-x64",
19+
urls = ["https://nodejs.org/download/release/v16.18.1/node-v16.18.1-linux-x64.tar.xz"],
20+
)
21+
22+
http_archive(
23+
name = "vendored_node_darwin_amd64",
24+
build_file_content = """exports_files(["bin/node"])""",
25+
sha256 = "79ff9ca43ae882051b2d607696cb3e70bfdef8c7b24f8d3effa3d41ff16368ff",
26+
strip_prefix = "node-v16.18.1-darwin-x64",
27+
urls = ["https://nodejs.org/download/release/v16.18.1/node-v16.18.1-darwin-x64.tar.xz"],
28+
)
29+
30+
http_archive(
31+
name = "vendored_node_windows_amd64",
32+
build_file_content = """exports_files(["node.exe"])""",
33+
sha256 = "db6a81de8e8ca3444495f1bcf04a883c076b4325d0fbaa032a190f88b38b30c5",
34+
strip_prefix = "node-v16.18.1-win-x64",
35+
urls = ["https://nodejs.org/download/release/v16.18.1/node-v16.18.1-win-x64.zip"],
36+
)

e2e/vendored_node/WORKSPACE.bzlmod

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)