mirror of
https://github.com/angular/angular-cli.git
synced 2025-05-20 13:32:43 +08:00
build: update bazel to 4.0.0
Update to the latest version of bazel (4.0.0).
This commit is contained in:
parent
25e1460895
commit
b5c309ada1
20
.bazelrc
20
.bazelrc
@ -99,10 +99,8 @@ build:remote --define=EXECUTOR=remote
|
|||||||
# Setup the remote build execution servers.
|
# Setup the remote build execution servers.
|
||||||
build:remote --remote_cache=remotebuildexecution.googleapis.com
|
build:remote --remote_cache=remotebuildexecution.googleapis.com
|
||||||
build:remote --remote_executor=remotebuildexecution.googleapis.com
|
build:remote --remote_executor=remotebuildexecution.googleapis.com
|
||||||
build:remote --tls_enabled=true
|
build:remote --remote_timeout=600
|
||||||
build:remote --auth_enabled=true
|
build:remote --jobs=150
|
||||||
build:remote --remote_timeout=3600
|
|
||||||
build:remote --jobs=50
|
|
||||||
|
|
||||||
# Setup the toolchain and platform for the remote build execution. The platform
|
# Setup the toolchain and platform for the remote build execution. The platform
|
||||||
# is automatically configured by the "rbe_autoconfig" rule in the project workpsace.
|
# 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
|
|||||||
build:remote --host_platform=//tools:rbe_ubuntu1604-angular
|
build:remote --host_platform=//tools:rbe_ubuntu1604-angular
|
||||||
build:remote --platforms=//tools:rbe_ubuntu1604-angular
|
build:remote --platforms=//tools:rbe_ubuntu1604-angular
|
||||||
|
|
||||||
# Setup Build Event Service
|
|
||||||
build:remote --bes_backend=buildeventservice.googleapis.com
|
|
||||||
build:remote --bes_timeout=30s
|
|
||||||
build:remote --bes_results_url="https://source.cloud.google.com/results/invocations/"
|
|
||||||
|
|
||||||
# Set remote caching settings
|
# Set remote caching settings
|
||||||
build:remote --remote_accept_cached=true
|
build:remote --remote_accept_cached=true
|
||||||
|
|
||||||
@ -130,15 +123,14 @@ build:remote --remote_accept_cached=true
|
|||||||
build:remote --cpu=k8
|
build:remote --cpu=k8
|
||||||
build:remote --host_cpu=k8
|
build:remote --host_cpu=k8
|
||||||
|
|
||||||
|
# Set up authentication mechanism for RBE
|
||||||
|
build:remote --google_default_credentials
|
||||||
|
|
||||||
###############################
|
###############################
|
||||||
# NodeJS rules settings
|
# NodeJS rules settings
|
||||||
# These settings are required for rules_nodejs
|
# These settings are required for rules_nodejs
|
||||||
###############################
|
###############################
|
||||||
|
|
||||||
# Turn on managed directories feature in Bazel
|
|
||||||
# This allows us to avoid installing a second copy of node_modules
|
|
||||||
common --experimental_allow_incremental_repository_updates
|
|
||||||
|
|
||||||
####################################################
|
####################################################
|
||||||
# User bazel configuration
|
# User bazel configuration
|
||||||
# NOTE: This needs to be the *last* entry in the config.
|
# NOTE: This needs to be the *last* entry in the config.
|
||||||
@ -150,4 +142,4 @@ try-import .bazelrc.user
|
|||||||
|
|
||||||
# Enable runfiles even on Windows.
|
# Enable runfiles even on Windows.
|
||||||
# Architect resolves output files from data files, and this isn't possible without runfile support.
|
# Architect resolves output files from data files, and this isn't possible without runfile support.
|
||||||
test --enable_runfiles
|
test --enable_runfiles
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
3.4.1
|
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 WORKSPACE
|
# When updating the Bazel version you also need to update the RBE toolchains version in WORKSPACE
|
||||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -43,6 +43,7 @@ yarn-error.log*
|
|||||||
.ng-dev.log
|
.ng-dev.log
|
||||||
.ng-dev.user*
|
.ng-dev.user*
|
||||||
.husky/_
|
.husky/_
|
||||||
|
.bazelrc.user
|
||||||
|
|
||||||
# Mac OSX Finder files.
|
# Mac OSX Finder files.
|
||||||
**/.DS_Store
|
**/.DS_Store
|
||||||
|
@ -24,7 +24,7 @@ Angular has a dependency on the @bazel/bazelisk package which supplies it.
|
|||||||
Try running `yarn bazel` instead.
|
Try running `yarn bazel` instead.
|
||||||
(If you did run that, check that you've got a fresh `yarn install`)
|
(If you did run that, check that you've got a fresh `yarn install`)
|
||||||
""",
|
""",
|
||||||
minimum_bazel_version = "3.0.0",
|
minimum_bazel_version = "4.0.0",
|
||||||
)
|
)
|
||||||
|
|
||||||
# The NodeJS rules version must be at least the following version because:
|
# The NodeJS rules version must be at least the following version because:
|
||||||
@ -75,9 +75,9 @@ install_bazel_dependencies(suppress_warning = True)
|
|||||||
# Bring in bazel_toolchains for RBE setup configuration.
|
# Bring in bazel_toolchains for RBE setup configuration.
|
||||||
http_archive(
|
http_archive(
|
||||||
name = "bazel_toolchains",
|
name = "bazel_toolchains",
|
||||||
sha256 = "8c9728dc1bb3e8356b344088dfd10038984be74e1c8d6e92dbb05f21cabbb8e4",
|
sha256 = "1adf5db506a7e3c465a26988514cfc3971af6d5b3c2218925cd6e71ee443fc3f",
|
||||||
strip_prefix = "bazel-toolchains-3.7.1",
|
strip_prefix = "bazel-toolchains-4.0.0",
|
||||||
url = "https://github.com/bazelbuild/bazel-toolchains/archive/3.7.1.tar.gz",
|
url = "https://github.com/bazelbuild/bazel-toolchains/archive/4.0.0.tar.gz",
|
||||||
)
|
)
|
||||||
|
|
||||||
load("@bazel_toolchains//rules:environments.bzl", "clang_env")
|
load("@bazel_toolchains//rules:environments.bzl", "clang_env")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user