Skip to content

Commit c847b9d

Browse files
committed
build: bump yarn requirement to 1.17.3
1 parent d3f63a3 commit c847b9d

File tree

3 files changed

+33
-55
lines changed

3 files changed

+33
-55
lines changed

.circleci/config.yml

Lines changed: 29 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -49,47 +49,39 @@ var_7: &save_cache
4949
# Decryption token that is used to decode the GCP credentials file in ".circleci/gcp_token".
5050
var_8: &gcp_decrypt_token "angular"
5151

52-
# Job step that ensures that the node module dependencies are installed and up-to-date. We use
53-
# Yarn with the frozen lockfile option in order to make sure that lock file and package.json are
54-
# in sync. Unlike in Travis, we don't need to manually purge the node modules if stale because
55-
# CircleCI automatically discards the cache if the checksum of the lock file has changed.
56-
var_9: &yarn_install
52+
# Job step that ensures that the node module dependencies are installed and up-to-date. We use
53+
# Yarn with the frozen lockfile option in order to make sure that lock file and package.json are
54+
# in sync. Unlike in Travis, we don't need to manually purge the node modules if stale because
55+
# CircleCI automatically discards the cache if the checksum of the lock file has changed.
56+
var_99: &yarn_install
5757
run:
5858
name: "Installing project dependencies"
5959
command: yarn install --frozen-lockfile --non-interactive
6060

61-
# Anchor that can be used to download and install Yarn globally in the bash environment.
62-
var_10: &yarn_download
63-
run:
64-
name: "Downloading and installing Yarn"
65-
command: |
66-
touch $BASH_ENV
67-
curl -o- -L https://yarnpkg.com/install.sh | PROFILE=$BASH_ENV bash -s -- --version "1.16.0"
68-
6961
# Sets up the Bazel config which is specific for CircleCI builds.
70-
var_11: &setup_bazel_ci_config
62+
var_9: &setup_bazel_ci_config
7163
run:
7264
name: "Setting up Bazel configuration for CI"
7365
command: |
7466
echo "import %workspace%/.circleci/bazel.rc" >> ./.bazelrc
7567
7668
# Sets up a different Docker image that includes a moe recent Firefox version which
7769
# is needed for headless testing.
78-
var_12: &docker-firefox-image
70+
var_10: &docker-firefox-image
7971
# TODO(devversion): Temporarily use a image that includes Firefox 62 because the
8072
# ngcontainer image does include an old Firefox version that does not support headless.
8173
- image: circleci/node:11.4.0-browsers
8274

8375
# Attaches the release output which has been stored in the workspace to the current job.
8476
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
85-
var_13: &attach_release_output
77+
var_11: &attach_release_output
8678
attach_workspace:
8779
at: dist/
8880

8981
# Branch filter that we can specify for jobs that should only run on publish branches. This filter
9082
# is used to ensure that not all upstream branches will be published as Github builds
9183
# (e.g. revert branches, feature branches)
92-
var_14: &publish_branches_filter
84+
var_12: &publish_branches_filter
9385
branches:
9486
only:
9587
- master
@@ -103,31 +95,31 @@ var_14: &publish_branches_filter
10395
# In order to reduce duplication we use a YAML anchor that just always excludes the "_presubmit"
10496
# branch. We don't want to run Circle for the temporary "_presubmit" branch which is reserved
10597
# for the caretaker.
106-
var_15: &ignore_presubmit_branch_filter
98+
var_13: &ignore_presubmit_branch_filter
10799
branches:
108100
ignore:
109101
- "_presubmit"
110102
- "ivy-2019"
111103

112104
# Runs a script that sets up the Bazel remote execution. This will be used by jobs that run
113105
# Bazel primarily and should benefit from remote caching and execution.
114-
var_16: &setup_bazel_remote_execution
106+
var_14: &setup_bazel_remote_execution
115107
run:
116108
name: "Setup bazel RBE remote execution"
117109
command: ./scripts/circleci/bazel/setup-remote-execution.sh
118110

119111
# Sets up the bazel binary globally. We don't want to access bazel through Yarn and NodeJS
120112
# because it could mean that the Bazel child process only has access to limited memory.
121-
var_17: &setup_bazel_binary
113+
var_15: &setup_bazel_binary
122114
run:
123115
name: "Setting up global Bazel binary"
124116
command: ./scripts/circleci/setup_bazel_binary.sh
125117

126118
# **Note**: When updating the beginning of the cache key, also update the fallback cache
127119
# key to match the new cache key prefix. This allows us to take advantage of CircleCI's
128120
# fallback caching. Read more here: https://circleci.com/docs/2.0/caching/#restoring-cache.
129-
var_18: &mdc_deps_cache_key v1-mdc-deps-{{ checksum "/tmp/material-components-web/package-lock.json" }}
130-
var_19: &mdc_deps_fallback_cache_key v1-mdc-deps-
121+
var_16: &mdc_deps_cache_key v1-mdc-deps-{{ checksum "/tmp/material-components-web/package-lock.json" }}
122+
var_17: &mdc_deps_fallback_cache_key v1-mdc-deps-
131123

132124
# -----------------------------
133125
# Container version of CircleCI
@@ -153,7 +145,6 @@ jobs:
153145
- *restore_cache
154146
- *setup_bazel_ci_config
155147
- *setup_bazel_remote_execution
156-
- *yarn_download
157148
- *yarn_install
158149
- *setup_bazel_binary
159150

@@ -169,15 +160,14 @@ jobs:
169160
environment:
170161
GCP_DECRYPT_TOKEN: *gcp_decrypt_token
171162
steps:
172-
- *checkout_code
173-
- *restore_cache
174-
- *setup_bazel_ci_config
175-
- *setup_bazel_remote_execution
176-
- *yarn_download
177-
- *yarn_install
178-
- *setup_bazel_binary
163+
- *checkout_code
164+
- *restore_cache
165+
- *setup_bazel_ci_config
166+
- *setup_bazel_remote_execution
167+
- *yarn_install
168+
- *setup_bazel_binary
179169

180-
- run: bazel test tools/public_api_guard/...
170+
- run: bazel test tools/public_api_guard/...
181171

182172
# -----------------------------------------------------------------
183173
# Job that runs the e2e tests with Protractor and Chromium headless
@@ -192,7 +182,6 @@ jobs:
192182
- *restore_cache
193183
- *setup_bazel_ci_config
194184
- *setup_bazel_remote_execution
195-
- *yarn_download
196185
- *yarn_install
197186
- *setup_bazel_binary
198187

@@ -212,7 +201,6 @@ jobs:
212201
- *restore_cache
213202
- *setup_bazel_ci_config
214203
- *setup_bazel_remote_execution
215-
- *yarn_download
216204
- *yarn_install
217205
- *setup_bazel_binary
218206

@@ -231,7 +219,6 @@ jobs:
231219
steps:
232220
- *checkout_code
233221
- *restore_cache
234-
- *yarn_download
235222
- *yarn_install
236223

237224
- run: ./scripts/circleci/run-browserstack-tests.sh
@@ -250,12 +237,11 @@ jobs:
250237
# a rate limit exception.
251238
KARMA_PARALLEL_BROWSERS: 2
252239
steps:
253-
- *checkout_code
254-
- *restore_cache
255-
- *yarn_download
256-
- *yarn_install
240+
- *checkout_code
241+
- *restore_cache
242+
- *yarn_install
257243

258-
- run: ./scripts/circleci/run-saucelabs-tests.sh
244+
- run: ./scripts/circleci/run-saucelabs-tests.sh
259245

260246
# -------------------------------------------------------------------------
261247
# Job that pre-render's the universal app with `@angular/platform-server`.
@@ -264,12 +250,11 @@ jobs:
264250
prerender_build:
265251
<<: *job_defaults
266252
steps:
267-
- *checkout_code
268-
- *restore_cache
269-
- *yarn_download
270-
- *yarn_install
253+
- *checkout_code
254+
- *restore_cache
255+
- *yarn_install
271256

272-
- run: yarn gulp ci:prerender
257+
- run: yarn gulp ci:prerender
273258

274259
# ----------------------------------
275260
# Lint job. Runs the gulp lint task.
@@ -279,7 +264,6 @@ jobs:
279264
steps:
280265
- *checkout_code
281266
- *restore_cache
282-
- *yarn_download
283267
- *yarn_install
284268

285269
- run: ./scripts/circleci/lint-bazel-files.sh
@@ -297,7 +281,6 @@ jobs:
297281
steps:
298282
- *checkout_code
299283
- *restore_cache
300-
- *yarn_download
301284
- *yarn_install
302285

303286
- run: yarn gulp ci:build-release-packages
@@ -351,7 +334,6 @@ jobs:
351334
- *attach_release_output
352335
- *setup_bazel_ci_config
353336
- *setup_bazel_remote_execution
354-
- *yarn_download
355337
- *yarn_install
356338
- *setup_bazel_binary
357339

@@ -380,7 +362,6 @@ jobs:
380362
- *restore_cache
381363
- *setup_bazel_ci_config
382364
- *setup_bazel_remote_execution
383-
- *yarn_download
384365
- *yarn_install
385366
- *setup_bazel_binary
386367

@@ -401,7 +382,6 @@ jobs:
401382
- *restore_cache
402383
- *setup_bazel_ci_config
403384
- *setup_bazel_remote_execution
404-
- *yarn_download
405385
- *yarn_install
406386
- *setup_bazel_binary
407387

@@ -433,7 +413,6 @@ jobs:
433413
- *restore_cache
434414
- *setup_bazel_ci_config
435415
- *setup_bazel_remote_execution
436-
- *yarn_download
437416
- *yarn_install
438417
- *setup_bazel_binary
439418

@@ -464,7 +443,6 @@ jobs:
464443
- *setup_bazel_binary
465444
- *setup_bazel_ci_config
466445
- *setup_bazel_remote_execution
467-
- *yarn_download
468446
- *yarn_install
469447

470448
- run: git clone ${MDC_REPO_URL} --branch ${MDC_REPO_BRANCH} --depth 1 ${MDC_REPO_TMP_DIR}

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ check_bazel_version("0.27.0")
2626

2727
node_repositories(
2828
# For deterministic builds, specify explicit NodeJS and Yarn versions.
29-
node_version = "10.13.0",
29+
node_version = "10.16.0",
3030
yarn_repositories = {
31-
"1.16.0": ("yarn-v1.16.0.tar.gz", "yarn-v1.16.0", "df202627d9a70cf09ef2fb11cb298cb619db1b958590959d6f6e571b50656029"),
31+
"1.17.3": ("yarn-v1.17.3.tar.gz", "yarn-v1.17.3", "e3835194409f1b3afa1c62ca82f561f1c29d26580c9e220c36866317e043c6f3"),
3232
},
33-
yarn_version = "1.16.0",
33+
yarn_version = "1.17.3",
3434
)
3535

3636
yarn_install(

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"license": "MIT",
1111
"engines": {
1212
"node": ">= 5.4.1",
13-
"yarn": ">= 1.13.0"
13+
"yarn": ">= 1.17.3"
1414
},
1515
"scripts": {
1616
"postinstall": "ngc -p angular-tsconfig.json",

0 commit comments

Comments
 (0)