Skip to content

Commit 0c75a06

Browse files
josephperrottatscott
josephperrott
authored and
atscott
committed
build: upgrade to bazel 3.2.0 and rules_nodejs 1.7.0 (angular#37358)
Upgrade to rely on bazel version 3.2.0 and rules_nodejs 1.7.0. This is part of a routine update as new versions become available. PR Close angular#37358
1 parent aaa2009 commit 0c75a06

File tree

9 files changed

+55
-53
lines changed

9 files changed

+55
-53
lines changed

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
2.1.1
1+
3.2.0
22
# [NB: this comment has to be after the first line, see https://github.com/bazelbuild/bazelisk/issues/117]
33
# When updating the Bazel version you also need to update the RBE toolchains version in package.bzl

‎WORKSPACE‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
88
# Fetch rules_nodejs so we can install our npm dependencies
99
http_archive(
1010
name = "build_bazel_rules_nodejs",
11-
sha256 = "f9e7b9f42ae202cc2d2ce6d698ccb49a9f7f7ea572a78fd451696d03ef2ee116",
12-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.6.0/rules_nodejs-1.6.0.tar.gz"],
11+
sha256 = "84abf7ac4234a70924628baa9a73a5a5cbad944c4358cf9abdb4aab29c9a5b77",
12+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.7.0/rules_nodejs-1.7.0.tar.gz"],
1313
)
1414

1515
# Check the rules_nodejs version and download npm dependencies
1616
# Note: bazel (version 2 and after) will check the .bazelversion file so we don't need to
1717
# assert on that.
1818
load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
1919

20-
check_rules_nodejs_version(minimum_version_string = "1.6.0")
20+
check_rules_nodejs_version(minimum_version_string = "1.7.0")
2121

2222
# Setup the Node.js toolchain
2323
node_repositories(
@@ -91,17 +91,18 @@ rbe_autoconfig(
9191
# Need to specify a base container digest in order to ensure that we can use the checked-in
9292
# platform configurations for the "ubuntu16_04" image. Otherwise the autoconfig rule would
9393
# need to pull the image and run it in order determine the toolchain configuration. See:
94-
# https://github.com/bazelbuild/bazel-toolchains/blob/1.1.2/configs/ubuntu16_04_clang/versions.bzl
95-
base_container_digest = "sha256:1ab40405810effefa0b2f45824d6d608634ccddbf06366760c341ef6fbead011",
94+
# https://github.com/bazelbuild/bazel-toolchains/blob/3.2.0/configs/ubuntu16_04_clang/versions.bzl
95+
base_container_digest = "sha256:5e750dd878df9fcf4e185c6f52b9826090f6e532b097f286913a428290622332",
9696
# Note that if you change the `digest`, you might also need to update the
9797
# `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest>
9898
# and marketplace.gcr.io/google/rbe-ubuntu16-04:<base_container_digest> have
9999
# the same Clang and JDK installed. Clang is needed because of the dependency on
100100
# @com_google_protobuf. Java is needed for the Bazel's test executor Java tool.
101-
digest = "sha256:0b8fa87db4b8e5366717a7164342a029d1348d2feea7ecc4b18c780bc2507059",
101+
digest = "sha256:f743114235a43355bf8324e2ba0fa6a597236fe06f7bc99aaa9ac703631c306b",
102102
env = clang_env(),
103103
registry = "marketplace.gcr.io",
104104
# We can't use the default "ubuntu16_04" RBE image provided by the autoconfig because we need
105105
# a specific Linux kernel that comes with "libx11" in order to run headless browser tests.
106106
repository = "google/rbe-ubuntu16-04-webtest",
107+
use_checked_in_confs = "Force",
107108
)

‎integration/bazel/.bazelrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ test --test_output=errors
99
# Bazel doesn't calculate the memory ceiling correctly when running under Docker.
1010
# Limit Bazel to consuming resources that fit in CircleCI "xlarge" class
1111
# https://circleci.com/docs/2.0/configuration-reference/#resource_class
12-
build --local_resources=14336,8.0,1.0
12+
build --local_ram_resources=14336
13+
build --local_cpu_resources=8
1314

1415
# Use the Angular Ivy compiler
1516
# See https://github.com/angular/angular/blob/master/docs/BAZEL.md#various-flags-used-for-tests

‎integration/bazel/.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2.0
1+
3.2.0

‎integration/bazel/WORKSPACE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
55
# Fetch rules_nodejs so we can install our npm dependencies
66
http_archive(
77
name = "build_bazel_rules_nodejs",
8-
sha256 = "f9e7b9f42ae202cc2d2ce6d698ccb49a9f7f7ea572a78fd451696d03ef2ee116",
9-
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.6.0/rules_nodejs-1.6.0.tar.gz"],
8+
sha256 = "84abf7ac4234a70924628baa9a73a5a5cbad944c4358cf9abdb4aab29c9a5b77",
9+
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/1.7.0/rules_nodejs-1.7.0.tar.gz"],
1010
)
1111

1212
# Fetch sass rules for compiling sass files

‎integration/bazel/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"@angular/compiler": "file:../../dist/packages-dist/compiler",
2424
"@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
2525
"@bazel/bazelisk": "file:../../node_modules/@bazel/bazelisk",
26-
"@bazel/karma": "1.6.0",
27-
"@bazel/protractor": "1.6.0",
28-
"@bazel/rollup": "1.6.0",
29-
"@bazel/terser": "1.6.0",
30-
"@bazel/typescript": "1.6.0",
26+
"@bazel/karma": "1.7.0",
27+
"@bazel/protractor": "1.7.0",
28+
"@bazel/rollup": "1.7.0",
29+
"@bazel/terser": "1.7.0",
30+
"@bazel/typescript": "1.7.0",
3131
"@types/jasmine": "2.8.8",
3232
"http-server": "0.12.0",
3333
"karma": "4.4.1",

‎package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@
5353
"@babel/template": "^7.8.6",
5454
"@babel/traverse": "^7.8.6",
5555
"@babel/types": "^7.8.6",
56-
"@bazel/jasmine": "1.6.0",
57-
"@bazel/karma": "1.6.0",
58-
"@bazel/protractor": "1.6.0",
59-
"@bazel/rollup": "1.6.0",
60-
"@bazel/terser": "1.6.0",
61-
"@bazel/typescript": "1.6.0",
56+
"@bazel/jasmine": "1.7.0",
57+
"@bazel/karma": "1.7.0",
58+
"@bazel/protractor": "1.7.0",
59+
"@bazel/rollup": "1.7.0",
60+
"@bazel/terser": "1.7.0",
61+
"@bazel/typescript": "1.7.0",
6262
"@microsoft/api-extractor": "7.7.11",
6363
"@octokit/rest": "16.28.7",
6464
"@schematics/angular": "9.1.0",

‎packages/bazel/package.bzl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ def rules_angular_dev_dependencies():
2929
_maybe(
3030
http_archive,
3131
name = "bazel_toolchains",
32-
sha256 = "b5a8039df7119d618402472f3adff8a1bd0ae9d5e253f53fcc4c47122e91a3d2",
33-
strip_prefix = "bazel-toolchains-2.1.1",
32+
sha256 = "db48eed61552e25d36fe051a65d2a329cc0fb08442627e8f13960c5ab087a44e",
33+
strip_prefix = "bazel-toolchains-3.2.0",
3434
urls = [
35-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/2.1.1/bazel-toolchains-2.1.1.tar.gz",
36-
"https://github.com/bazelbuild/bazel-toolchains/releases/download/2.1.1/bazel-toolchains-2.1.1.tar.gz",
35+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/3.2.0/bazel-toolchains-3.2.0.tar.gz",
36+
"https://github.com/bazelbuild/bazel-toolchains/releases/download/3.2.0/bazel-toolchains-3.2.0.tar.gz",
3737
],
3838
)
3939

‎yarn.lock‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -973,46 +973,46 @@
973973
"@bazel/buildifier-win32_x64" "0.29.0"
974974

975975
"@bazel/ibazel@^0.12.3":
976-
version "0.12.3"
977-
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.12.3.tgz#c8c82647f920cd529c7793c50e087e1a754a5973"
978-
integrity sha512-dyx62Uo5kogrxFmqFNpGvbavfr8yjmuQlOyZczOuA60piULwlUsO7Oh3/1OUWKDSXaMMqHhFQfpdl+z0HjI6TQ==
976+
version "0.12.4"
977+
resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.12.4.tgz#ddda7c8ead6e29dc8d637af446086a750f395218"
978+
integrity sha512-FzOy+esB/fXVDbAmL6Ce2yCEy+PESZih8GypKhi0B8XzoZHAAn3QNnQcMNwo9PrIfp3G1989nM/JQ1b8jwEinQ==
979979

980-
"@bazel/jasmine@1.6.0":
981-
version "1.6.0"
982-
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-1.6.0.tgz#c469ab8725d9a2e48c0c3c965861ff8add9272ac"
983-
integrity sha512-WtOQDtIMHKTxlp0+FcdrADV6LMrpJV7eEGZippSNFPL5YhwwrPfCSOs5WkooatsrjL5YEszswzqQXFjvC7EZKQ==
980+
"@bazel/jasmine@1.7.0":
981+
version "1.7.0"
982+
resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-1.7.0.tgz#429df76e6628aa139176340434729cc091e371d7"
983+
integrity sha512-LXq6nfBBEczjsDLwFW9kesGdewRrnFiAOZzXAAivCV3xtq516xK4QnVWA9tQGq+R1DnY50IaODpCJhh8PDezdg==
984984
dependencies:
985985
jasmine "~3.5.0"
986986
jasmine-core "~3.5.0"
987987
jasmine-reporters "~2.3.2"
988988
v8-coverage "1.0.9"
989989

990-
"@bazel/karma@1.6.0":
991-
version "1.6.0"
992-
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.6.0.tgz#98950b71114dd9ec169e6778a35d31ae1f578655"
993-
integrity sha512-9cX0E1SiMWwA70ZMFnMzeqSRn3biduGx03bGV77FSUYKocZpyfU2cOEygYGfxAqHnyM7x4cS8nflRv3+ZE0Aqg==
990+
"@bazel/karma@1.7.0":
991+
version "1.7.0"
992+
resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-1.7.0.tgz#ec7e97a2629f5af0b2abe9a99ae30363a34af97d"
993+
integrity sha512-mGYVD9DldB3v/DjxJpS39X1vUD6M32Al96DMoilwW3TSAazcRWwUAC6HY9z5Wtyeqwxyk8BY1Mg1/berWpoTxg==
994994
dependencies:
995995
tmp "0.1.0"
996996

997-
"@bazel/protractor@1.6.0":
998-
version "1.6.0"
999-
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.6.0.tgz#cf095a1dbc038def7031c513a3b87f4e79bedb00"
1000-
integrity sha512-gPiRv0oUJbVPpQ9nrwe5vjkffAc8VsYJhpTGgG+8aPdOaTLWgmBP/sy4BdfijU9O1Z/mNYojQCZgMzQz6kAvdg==
997+
"@bazel/protractor@1.7.0":
998+
version "1.7.0"
999+
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-1.7.0.tgz#1ced325a64d77bccca4bf881e62982d017d6b639"
1000+
integrity sha512-sLbejWwmwTupCS3JKdBeiZMUbylLpJxJdlrz8sZ9t4KV6YiFAXNOloCScrrdOkeiJz5QQZRG3p3rqHbIszUAwQ==
10011001

1002-
"@bazel/rollup@1.6.0":
1003-
version "1.6.0"
1004-
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.6.0.tgz#c0bdad0ad0ba5c5b2e21d1634dc2ce48840ca044"
1005-
integrity sha512-MLF7laHX3CSAJH+RbIEVWgnQdz3U8dPkdJWJqiX/z9mUSEgC47LNsMBPKlRy1TpOJOpw1j0vLaJv0qN/bgq9NQ==
1002+
"@bazel/rollup@1.7.0":
1003+
version "1.7.0"
1004+
resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-1.7.0.tgz#5c0f0d51d2f3f14e78781a4b9e6a9ffba87f1579"
1005+
integrity sha512-Pp5aCJw3gwu77zn6/fQgZ39ArrWEI5O3dja5wKadBnfOQ66PImIEr+bf7JgROoWvACH1kGxaS423rq51fiuCsA==
10061006

1007-
"@bazel/terser@1.6.0":
1008-
version "1.6.0"
1009-
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.6.0.tgz#63ccd20dd6c9793e7b3b23fb5ea82b55b3ef6eb2"
1010-
integrity sha512-csBrN4XfX/hYTtDVcH/ulVO9K4Ca/IlrCWk5o/l7JBJq/cHoTj5AWIA7PKJ4QgnxXeEjso4CmLFgUMEVKVYV3Q==
1007+
"@bazel/terser@1.7.0":
1008+
version "1.7.0"
1009+
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-1.7.0.tgz#c43e711e13b9a71c7abd3ade04fb4650d547ad01"
1010+
integrity sha512-u/UXk0WUinvkk1g5xxfqGieBz3r12Bj2y2m25lC5GjHBgCpGk7DyeGGi9H3QQNO1Wmpw51QSE9gaPzKzjUVGug==
10111011

1012-
"@bazel/typescript@1.6.0":
1013-
version "1.6.0"
1014-
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.6.0.tgz#8dfd29e71bcf917d5f9cb67f19ac4dcfc9082439"
1015-
integrity sha512-vAKuwy1Hgl+t3M3sH/G0oqHRYN35TdENj+0lsCI3x7EbSzyI6cbA3YQrLrlyvdScksqOpZa3PZ3UBGqfJJq2DA==
1012+
"@bazel/typescript@1.7.0":
1013+
version "1.7.0"
1014+
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-1.7.0.tgz#8dc02b8a161f4fff3285186066b5f73666793452"
1015+
integrity sha512-M6JPXJZ+W6457QZfPHmGg/Mejnp7//YTnffGmnmeK9vDqybXeCCRWW1/iEOwopLJYQViBHfaoulde0VXelx9sA==
10161016
dependencies:
10171017
protobufjs "6.8.8"
10181018
semver "5.6.0"

0 commit comments

Comments
 (0)