Skip to content

Commit b5c309a

Browse files
josephperrottalan-agius4
authored andcommitted
build: update bazel to 4.0.0
Update to the latest version of bazel (4.0.0).
1 parent 25e1460 commit b5c309a

File tree

4 files changed

+13
-20
lines changed

4 files changed

+13
-20
lines changed

.bazelrc

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,8 @@ build:remote --define=EXECUTOR=remote
9999
# Setup the remote build execution servers.
100100
build:remote --remote_cache=remotebuildexecution.googleapis.com
101101
build:remote --remote_executor=remotebuildexecution.googleapis.com
102-
build:remote --tls_enabled=true
103-
build:remote --auth_enabled=true
104-
build:remote --remote_timeout=3600
105-
build:remote --jobs=50
102+
build:remote --remote_timeout=600
103+
build:remote --jobs=150
106104

107105
# Setup the toolchain and platform for the remote build execution. The platform
108106
# is automatically configured by the "rbe_autoconfig" rule in the project workpsace.
@@ -117,11 +115,6 @@ build:remote --extra_execution_platforms=//tools:rbe_ubuntu1604-angular
117115
build:remote --host_platform=//tools:rbe_ubuntu1604-angular
118116
build:remote --platforms=//tools:rbe_ubuntu1604-angular
119117

120-
# Setup Build Event Service
121-
build:remote --bes_backend=buildeventservice.googleapis.com
122-
build:remote --bes_timeout=30s
123-
build:remote --bes_results_url="https://source.cloud.google.com/results/invocations/"
124-
125118
# Set remote caching settings
126119
build:remote --remote_accept_cached=true
127120

@@ -130,15 +123,14 @@ build:remote --remote_accept_cached=true
130123
build:remote --cpu=k8
131124
build:remote --host_cpu=k8
132125

126+
# Set up authentication mechanism for RBE
127+
build:remote --google_default_credentials
128+
133129
###############################
134130
# NodeJS rules settings
135131
# These settings are required for rules_nodejs
136132
###############################
137133

138-
# Turn on managed directories feature in Bazel
139-
# This allows us to avoid installing a second copy of node_modules
140-
common --experimental_allow_incremental_repository_updates
141-
142134
####################################################
143135
# User bazel configuration
144136
# NOTE: This needs to be the *last* entry in the config.
@@ -150,4 +142,4 @@ try-import .bazelrc.user
150142

151143
# Enable runfiles even on Windows.
152144
# Architect resolves output files from data files, and this isn't possible without runfile support.
153-
test --enable_runfiles
145+
test --enable_runfiles

.bazelversion

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
3.4.1
1+
4.0.0
22
# [NB: this comment has to be after the first line, see https://github.com/bazelbuild/bazelisk/issues/117]
3-
# When updating the Bazel version you also need to update the RBE toolchains version in WORKSPACE
3+
# When updating the Bazel version you also need to update the RBE toolchains version in WORKSPACE

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ yarn-error.log*
4343
.ng-dev.log
4444
.ng-dev.user*
4545
.husky/_
46+
.bazelrc.user
4647

4748
# Mac OSX Finder files.
4849
**/.DS_Store

WORKSPACE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Angular has a dependency on the @bazel/bazelisk package which supplies it.
2424
Try running `yarn bazel` instead.
2525
(If you did run that, check that you've got a fresh `yarn install`)
2626
""",
27-
minimum_bazel_version = "3.0.0",
27+
minimum_bazel_version = "4.0.0",
2828
)
2929

3030
# The NodeJS rules version must be at least the following version because:
@@ -75,9 +75,9 @@ install_bazel_dependencies(suppress_warning = True)
7575
# Bring in bazel_toolchains for RBE setup configuration.
7676
http_archive(
7777
name = "bazel_toolchains",
78-
sha256 = "8c9728dc1bb3e8356b344088dfd10038984be74e1c8d6e92dbb05f21cabbb8e4",
79-
strip_prefix = "bazel-toolchains-3.7.1",
80-
url = "https://github.com/bazelbuild/bazel-toolchains/archive/3.7.1.tar.gz",
78+
sha256 = "1adf5db506a7e3c465a26988514cfc3971af6d5b3c2218925cd6e71ee443fc3f",
79+
strip_prefix = "bazel-toolchains-4.0.0",
80+
url = "https://github.com/bazelbuild/bazel-toolchains/archive/4.0.0.tar.gz",
8181
)
8282

8383
load("@bazel_toolchains//rules:environments.bzl", "clang_env")

0 commit comments

Comments
 (0)