honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: update .bazelversion (#40579)

Browse Source 
Update to the latest version of bazel.

`4.0.0` introduced a breaking change on unnecessary backslashes and these
instance are corrected in this change.

PR Close #40579
This commit is contained in:
Joey Perrott 2021-01-26 08:57:44 -08:00 committed by Jessica Janiuk
parent ffad040a96
commit 39b3cbbdf5
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bazelversion
View File

@ -1,3 +1,3 @@
3.6.0 4.0.0
# [NB: this comment has to be after the first line, see https://github.com/bazelbuild/bazelisk/issues/117] # [NB: this comment has to be after the first line, see https://github.com/bazelbuild/bazelisk/issues/117]
# When updating the Bazel version you also need to update the RBE toolchains version in package.bzl # When updating the Bazel version you also need to update the RBE toolchains version in package.bzl

2
WORKSPACE
View File

@ -76,7 +76,7 @@ rbe_autoconfig(
# Need to specify a base container digest in order to ensure that we can use the checked-in # Need to specify a base container digest in order to ensure that we can use the checked-in
# platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would # platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would
# need to pull the image and run it in order determine the toolchain configuration. See: # need to pull the image and run it in order determine the toolchain configuration. See:
# https://github.com/bazelbuild/bazel-toolchains/blob/3.6.0/configs/ubuntu16_04_clang/versions.bzl # https://github.com/bazelbuild/bazel-toolchains/blob/4.0.0/configs/ubuntu16_04_clang/versions.bzl
base_container_digest = "sha256:f6568d8168b14aafd1b707019927a63c2d37113a03bcee188218f99bd0327ea1", base_container_digest = "sha256:f6568d8168b14aafd1b707019927a63c2d37113a03bcee188218f99bd0327ea1",
# Note that if you change the `digest`, you might also need to update the # Note that if you change the `digest`, you might also need to update the
# `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest> # `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest>

2
dev-infra/BUILD.bazel
View File

@ -58,7 +58,7 @@ pkg_npm(
# This substitution is particularly verbose because we need to make sure # This substitution is particularly verbose because we need to make sure
# that only things available via Angular Bazel are imported from # that only things available via Angular Bazel are imported from
# tools/defaults.bzl. # tools/defaults.bzl.
"load\(\"//tools:defaults.bzl\", \"ng_module\"\)": "load(\"@npm//@angular/bazel:index.bzl\", \"ng_module\")", "load(\"//tools:defaults.bzl\", \"ng_module\")": "load(\"@npm//@angular/bazel:index.bzl\", \"ng_module\")",
}, },
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [

2
packages/bazel/BUILD.bazel
View File

@ -17,7 +17,7 @@ pkg_npm(
"//packages/bazel/docs", "//packages/bazel/docs",
], ],
substitutions = { substitutions = {
"(#|\/\/)\\s+BEGIN-DEV-ONLY[\\w\W]+?(#|\/\/)\\s+END-DEV-ONLY": "", "(#|//)\\s+BEGIN-DEV-ONLY[\\w\\W]+?(#|//)\\s+END-DEV-ONLY": "",
"//packages/bazel/": "//@angular/bazel/", "//packages/bazel/": "//@angular/bazel/",
"@npm//@bazel/typescript/internal:": "//@bazel/typescript/internal:", "@npm//@bazel/typescript/internal:": "//@bazel/typescript/internal:",
}, },

8
packages/bazel/package.bzl
View File

@ -29,11 +29,11 @@ def rules_angular_dev_dependencies():
_maybe( _maybe(
http_archive, http_archive,
name = "bazel_toolchains", name = "bazel_toolchains",
sha256 = "4fb3ceea08101ec41208e3df9e56ec72b69f3d11c56629d6477c0ff88d711cf7", sha256 = "1adf5db506a7e3c465a26988514cfc3971af6d5b3c2218925cd6e71ee443fc3f",
strip_prefix = "bazel-toolchains-3.6.0", strip_prefix = "bazel-toolchains-4.0.0",
urls = [ urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.6.0/bazel-toolchains-3.6.0.tar.gz", "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.6.0/bazel-toolchains-3.6.0.tar.gz", "https://github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
], ],
) )

2
packages/common/locales/BUILD.bazel
View File

@ -23,7 +23,7 @@ pkg_npm(
# dependencies in case require was called. # dependencies in case require was called.
# We don't actually import anything in the locale code so we can # We don't actually import anything in the locale code so we can
# null out the require reference passed into the module. # null out the require reference passed into the module.
"factory\(require, exports\)": "factory(null, exports)", "factory\\(require, exports\\)": "factory(null, exports)",
}, },
deps = [":locales"], deps = [":locales"],
) )

2
packages/private/testing/BUILD.bazel
View File

@ -30,5 +30,5 @@ ng_module(
genrule( genrule(
name = "angular_ivy_enabled", name = "angular_ivy_enabled",
outs = ["src/angular_ivy_enabled.ts"], outs = ["src/angular_ivy_enabled.ts"],
cmd = "echo export const ivyEnabled = \"'True'.toString() == '$(angular_ivy_enabled)'\"\; > $@", cmd = "echo export const ivyEnabled = \"'True'.toString() == '$(angular_ivy_enabled)'\" > $@",
) )