Skip to content

Commit ee03408

Browse files
committedOct 6, 2020
ci: use larger resource classes for bazel builds (angular#39124)
Migrates to using larger resource classes for windows CI runs as well as updating the bazel rcs for windows and linux to use all/more of the resources available in the executors PR Close angular#39124
1 parent d8c0534 commit ee03408

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed
 

‎.circleci/bazel.linux.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ build --repository_cache=/home/circleci/bazel_repository_cache
1414
# Bazel doesn't calculate the memory ceiling correctly when running under Docker.
1515
# Limit Bazel to consuming resources that fit in CircleCI "xlarge" class
1616
# https://circleci.com/docs/2.0/configuration-reference/#resource_class
17-
build --local_cpu_resources=8
18-
build --local_ram_resources=14336
17+
build --local_cpu_resources=20
18+
build --local_ram_resources=32768
1919

2020
# All build executed remotely should be done using our RBE configuration.
2121
build:remote --google_default_credentials

‎.circleci/bazel.windows.rc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ try-import %workspace%/.circleci/bazel.common.rc
1111
build --repository_cache=C:/Users/circleci/bazel_repository_cache
1212

1313
# Manually set the local resources used in windows CI runs
14-
build --local_ram_resources=13500
15-
build --local_cpu_resources=4
14+
build --local_ram_resources=120000
15+
build --local_cpu_resources=32
1616

1717
# All windows jobs run on master and should use http caching
1818
build --remote_http_cache=https://storage.googleapis.com/angular-team-cache

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ executors:
8080

8181
windows-executor:
8282
working_directory: ~/ng
83-
resource_class: windows.medium
83+
resource_class: windows.2xlarge
8484
# CircleCI windows VMs do have the GitBash shell available:
8585
# https://github.com/CircleCI-Public/windows-preview-docs#shells
8686
# But in this specific case we really should not use it because Bazel must not be ran from

‎.circleci/windows-env.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ copy .circleci\bazel.windows.rc ${Env:USERPROFILE}\.bazelrc
4141
####################################################################################################
4242
# Install specific version of node.
4343
####################################################################################################
44-
choco install nodejs --version 12.14.1 --no-progress
44+
nvm install 12.14.1
45+
nvm use 12.14.1
4546

4647
# These Bazel prereqs aren't needed because the CircleCI image already includes them.
4748
# choco install yarn --version 1.16.0 --no-progress

0 commit comments

Comments
 (0)
Please sign in to comment.