Skip to content

Commit 22ef665

Browse files
authored
test: upgrade github.com/ash2k/bazel-tools to rules_multirun (#2307)
1 parent 9d23805 commit 22ef665

File tree

8 files changed

+5
-74
lines changed

8 files changed

+5
-74
lines changed

e2e/js_run_devserver/MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ local_path_override(
66

77
bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
88
bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
9+
bazel_dep(name = "rules_multirun", version = "0.12.0", dev_dependency = True)
910

1011
pnpm = use_extension(
1112
"@aspect_rules_js//npm:extensions.bzl",

e2e/js_run_devserver/WORKSPACE

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,7 @@ npm_repositories()
3333
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
3434

3535
http_archive(
36-
name = "com_github_ash2k_bazel_tools",
37-
sha256 = "a911dab6711bc12a00f02cc94b66ced7dc57650e382ebd4f17c9cdb8ec2cbd56",
38-
strip_prefix = "bazel-tools-2add5bb84c2837a82a44b57e83c7414247aed43a",
39-
url = "https://github.com/ash2k/bazel-tools/archive/2add5bb84c2837a82a44b57e83c7414247aed43a.tar.gz",
36+
name = "rules_multirun",
37+
sha256 = "1d130f696f69fc25fe93c42043e1ded52418ed78b0fdcae678e247adad8c36b1",
38+
url = "https://github.com/keith/rules_multirun/releases/download/0.12.0/rules_multirun.0.12.0.tar.gz",
4039
)
41-
42-
load("@com_github_ash2k_bazel_tools//multirun:deps.bzl", "multirun_dependencies")
43-
44-
multirun_dependencies()

e2e/js_run_devserver/WORKSPACE.bzlmod

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,2 @@
11
# The presence of this file causes WORKSPACE to be ignored when bzlmod is enabled.
22
# See https://docs.google.com/document/d/1JtXIVnXyFZ4bmbiBCr5gsTH4-opZAFf5DMMb-54kES0/edit#heading=h.y054fjub9max
3-
4-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
5-
6-
http_archive(
7-
name = "com_github_ash2k_bazel_tools",
8-
sha256 = "0ad31a16c9e48b01a1a11daf908227a6bf6106269187cccf7398625fea2ba45a",
9-
strip_prefix = "bazel-tools-4e045b9b4e3e613970ab68941b556a356239d433",
10-
url = "https://github.com/ash2k/bazel-tools/archive/4e045b9b4e3e613970ab68941b556a356239d433.tar.gz",
11-
)
12-
13-
load("@com_github_ash2k_bazel_tools//multirun:deps.bzl", "multirun_dependencies")
14-
15-
multirun_dependencies()

e2e/js_run_devserver/src/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")
22
load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_library", "js_run_devserver")
3-
load("@com_github_ash2k_bazel_tools//multirun:def.bzl", "command", "multirun")
43
load("@npm//:http-server/package_json.bzl", http_server_bin = "bin")
4+
load("@rules_multirun//:defs.bzl", "command", "multirun")
55

66
http_server_bin.http_server_binary(
77
name = "http_server",

e2e/webpack_devserver/WORKSPACE

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,3 @@ npm_translate_lock(
2323
load("@npm//:repositories.bzl", "npm_repositories")
2424

2525
npm_repositories()
26-
27-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
28-
29-
http_archive(
30-
name = "com_github_ash2k_bazel_tools",
31-
sha256 = "a911dab6711bc12a00f02cc94b66ced7dc57650e382ebd4f17c9cdb8ec2cbd56",
32-
strip_prefix = "bazel-tools-2add5bb84c2837a82a44b57e83c7414247aed43a",
33-
url = "https://github.com/ash2k/bazel-tools/archive/2add5bb84c2837a82a44b57e83c7414247aed43a.tar.gz",
34-
)
35-
36-
load("@com_github_ash2k_bazel_tools//multirun:deps.bzl", "multirun_dependencies")
37-
38-
multirun_dependencies()
Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,2 @@
11
# The presence of this file causes WORKSPACE to be ignored when bzlmod is enabled.
22
# See https://docs.google.com/document/d/1JtXIVnXyFZ4bmbiBCr5gsTH4-opZAFf5DMMb-54kES0/edit#heading=h.y054fjub9max
3-
4-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
5-
6-
http_archive(
7-
name = "com_github_ash2k_bazel_tools",
8-
sha256 = "0ad31a16c9e48b01a1a11daf908227a6bf6106269187cccf7398625fea2ba45a",
9-
strip_prefix = "bazel-tools-4e045b9b4e3e613970ab68941b556a356239d433",
10-
url = "https://github.com/ash2k/bazel-tools/archive/4e045b9b4e3e613970ab68941b556a356239d433.tar.gz",
11-
)
12-
13-
load("@com_github_ash2k_bazel_tools//multirun:deps.bzl", "multirun_dependencies")
14-
15-
multirun_dependencies()

e2e/webpack_devserver_esm/WORKSPACE

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,3 @@ npm_translate_lock(
2323
load("@npm//:repositories.bzl", "npm_repositories")
2424

2525
npm_repositories()
26-
27-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
28-
29-
http_archive(
30-
name = "com_github_ash2k_bazel_tools",
31-
sha256 = "a911dab6711bc12a00f02cc94b66ced7dc57650e382ebd4f17c9cdb8ec2cbd56",
32-
strip_prefix = "bazel-tools-2add5bb84c2837a82a44b57e83c7414247aed43a",
33-
url = "https://github.com/ash2k/bazel-tools/archive/2add5bb84c2837a82a44b57e83c7414247aed43a.tar.gz",
34-
)
35-
36-
load("@com_github_ash2k_bazel_tools//multirun:deps.bzl", "multirun_dependencies")
37-
38-
multirun_dependencies()
Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,2 @@
11
# The presence of this file causes WORKSPACE to be ignored when bzlmod is enabled.
22
# See https://docs.google.com/document/d/1JtXIVnXyFZ4bmbiBCr5gsTH4-opZAFf5DMMb-54kES0/edit#heading=h.y054fjub9max
3-
4-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
5-
6-
http_archive(
7-
name = "com_github_ash2k_bazel_tools",
8-
sha256 = "0ad31a16c9e48b01a1a11daf908227a6bf6106269187cccf7398625fea2ba45a",
9-
strip_prefix = "bazel-tools-4e045b9b4e3e613970ab68941b556a356239d433",
10-
url = "https://github.com/ash2k/bazel-tools/archive/4e045b9b4e3e613970ab68941b556a356239d433.tar.gz",
11-
)
12-
13-
load("@com_github_ash2k_bazel_tools//multirun:deps.bzl", "multirun_dependencies")
14-
15-
multirun_dependencies()

0 commit comments

Comments
 (0)