From 744e7d60172fbea1893d501b8641f2aa1e785db6 Mon Sep 17 00:00:00 2001 From: Simon Stewart Date: Thu, 12 Dec 2024 13:40:50 +0000 Subject: [PATCH] [bazel] Switch to rules_closure 0.12.0 (#14895) --- WORKSPACE | 13 ++----------- javascript/rules_closure_shell.patch | 12 ------------ 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 javascript/rules_closure_shell.patch diff --git a/WORKSPACE b/WORKSPACE index d3487546d89cb..b33f16328442d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -6,17 +6,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "io_bazel_rules_closure", - patch_args = [ - "-p1", - ], - patches = [ - "//javascript:rules_closure_shell.patch", - ], - sha256 = "d66deed38a0bb20581c15664f0ab62270af5940786855c7adc3087b27168b529", - strip_prefix = "rules_closure-0.11.0", - urls = [ - "https://github.com/bazelbuild/rules_closure/archive/0.11.0.tar.gz", - ], + strip_prefix = "rules_closure-0.12.0", + url = "https://github.com/bazelbuild/rules_closure/archive/refs/tags/0.12.0.tar.gz", ) load("@io_bazel_rules_closure//closure:repositories.bzl", "rules_closure_dependencies", "rules_closure_toolchains") diff --git a/javascript/rules_closure_shell.patch b/javascript/rules_closure_shell.patch deleted file mode 100644 index 932afebe364a7..0000000000000 --- a/javascript/rules_closure_shell.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/closure/compiler/closure_js_deps.bzl b/closure/compiler/closure_js_deps.bzl -index 197c621..6db3aa8 100644 ---- a/closure/compiler/closure_js_deps.bzl -+++ b/closure/compiler/closure_js_deps.bzl -@@ -52,6 +52,7 @@ def _impl(ctx): - ) - ]), - executable = ctx.executable._depswriter, -+ use_default_shell_env = True, - progress_message = "Calculating %d JavaScript deps to %s" % ( - len(js.srcs.to_list()), - ctx.outputs.out.short_path,