Skip to content

Commit 612a0df

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

File tree

3 files changed

+14
-59
lines changed

3 files changed

+14
-59
lines changed

.circleci/config.yml

Lines changed: 10 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var_1: &docker_image circleci/node:10.16
1313
# the new cache key prefix. This allows us to take advantage of CircleCI's fallback caching.
1414
# Read more here: https://circleci.com/docs/2.0/caching/#restoring-cache.
1515
var_2: &cache_key v4-ng-mat-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
16-
var_3: &cache_fallback_key v4-ng-mat-
16+
var_3: &cache_fallback_key v5-ng-mat-
1717

1818
# Settings common to each job
1919
var_4: &job_defaults
@@ -49,47 +49,30 @@ 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
57-
run:
58-
name: "Installing project dependencies"
59-
command: yarn install --frozen-lockfile --non-interactive
60-
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-
6952
# Sets up the Bazel config which is specific for CircleCI builds.
70-
var_11: &setup_bazel_ci_config
53+
var_9: &setup_bazel_ci_config
7154
run:
7255
name: "Setting up Bazel configuration for CI"
7356
command: |
7457
echo "import %workspace%/.circleci/bazel.rc" >> ./.bazelrc
7558
7659
# Sets up a different Docker image that includes a moe recent Firefox version which
7760
# is needed for headless testing.
78-
var_12: &docker-firefox-image
61+
var_10: &docker-firefox-image
7962
# TODO(devversion): Temporarily use a image that includes Firefox 62 because the
8063
# ngcontainer image does include an old Firefox version that does not support headless.
8164
- image: circleci/node:11.4.0-browsers
8265

8366
# Attaches the release output which has been stored in the workspace to the current job.
8467
# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
85-
var_13: &attach_release_output
68+
var_11: &attach_release_output
8669
attach_workspace:
8770
at: dist/
8871

8972
# Branch filter that we can specify for jobs that should only run on publish branches. This filter
9073
# is used to ensure that not all upstream branches will be published as Github builds
9174
# (e.g. revert branches, feature branches)
92-
var_14: &publish_branches_filter
75+
var_12: &publish_branches_filter
9376
branches:
9477
only:
9578
- master
@@ -103,31 +86,31 @@ var_14: &publish_branches_filter
10386
# In order to reduce duplication we use a YAML anchor that just always excludes the "_presubmit"
10487
# branch. We don't want to run Circle for the temporary "_presubmit" branch which is reserved
10588
# for the caretaker.
106-
var_15: &ignore_presubmit_branch_filter
89+
var_13: &ignore_presubmit_branch_filter
10790
branches:
10891
ignore:
10992
- "_presubmit"
11093
- "ivy-2019"
11194

11295
# Runs a script that sets up the Bazel remote execution. This will be used by jobs that run
11396
# Bazel primarily and should benefit from remote caching and execution.
114-
var_16: &setup_bazel_remote_execution
97+
var_14: &setup_bazel_remote_execution
11598
run:
11699
name: "Setup bazel RBE remote execution"
117100
command: ./scripts/circleci/bazel/setup-remote-execution.sh
118101

119102
# Sets up the bazel binary globally. We don't want to access bazel through Yarn and NodeJS
120103
# because it could mean that the Bazel child process only has access to limited memory.
121-
var_17: &setup_bazel_binary
104+
var_15: &setup_bazel_binary
122105
run:
123106
name: "Setting up global Bazel binary"
124107
command: ./scripts/circleci/setup_bazel_binary.sh
125108

126109
# **Note**: When updating the beginning of the cache key, also update the fallback cache
127110
# key to match the new cache key prefix. This allows us to take advantage of CircleCI's
128111
# 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-
112+
var_16: &mdc_deps_cache_key v1-mdc-deps-{{ checksum "/tmp/material-components-web/package-lock.json" }}
113+
var_17: &mdc_deps_fallback_cache_key v1-mdc-deps-
131114

132115
# -----------------------------
133116
# Container version of CircleCI
@@ -153,8 +136,6 @@ jobs:
153136
- *restore_cache
154137
- *setup_bazel_ci_config
155138
- *setup_bazel_remote_execution
156-
- *yarn_download
157-
- *yarn_install
158139
- *setup_bazel_binary
159140

160141
- run: bazel build src/...
@@ -173,8 +154,6 @@ jobs:
173154
- *restore_cache
174155
- *setup_bazel_ci_config
175156
- *setup_bazel_remote_execution
176-
- *yarn_download
177-
- *yarn_install
178157
- *setup_bazel_binary
179158

180159
- run: bazel test tools/public_api_guard/...
@@ -192,8 +171,6 @@ jobs:
192171
- *restore_cache
193172
- *setup_bazel_ci_config
194173
- *setup_bazel_remote_execution
195-
- *yarn_download
196-
- *yarn_install
197174
- *setup_bazel_binary
198175

199176
- run: bazel test src/... --build_tag_filters=e2e --test_tag_filters=e2e
@@ -212,8 +189,6 @@ jobs:
212189
- *restore_cache
213190
- *setup_bazel_ci_config
214191
- *setup_bazel_remote_execution
215-
- *yarn_download
216-
- *yarn_install
217192
- *setup_bazel_binary
218193

219194
- run: bazel test src/... --build_tag_filters=-e2e --test_tag_filters=-e2e
@@ -231,8 +206,6 @@ jobs:
231206
steps:
232207
- *checkout_code
233208
- *restore_cache
234-
- *yarn_download
235-
- *yarn_install
236209

237210
- run: ./scripts/circleci/run-browserstack-tests.sh
238211

@@ -252,8 +225,6 @@ jobs:
252225
steps:
253226
- *checkout_code
254227
- *restore_cache
255-
- *yarn_download
256-
- *yarn_install
257228

258229
- run: ./scripts/circleci/run-saucelabs-tests.sh
259230

@@ -266,8 +237,6 @@ jobs:
266237
steps:
267238
- *checkout_code
268239
- *restore_cache
269-
- *yarn_download
270-
- *yarn_install
271240

272241
- run: yarn gulp ci:prerender
273242

@@ -279,8 +248,6 @@ jobs:
279248
steps:
280249
- *checkout_code
281250
- *restore_cache
282-
- *yarn_download
283-
- *yarn_install
284251

285252
- run: ./scripts/circleci/lint-bazel-files.sh
286253
- run: yarn gulp ci:lint
@@ -297,8 +264,6 @@ jobs:
297264
steps:
298265
- *checkout_code
299266
- *restore_cache
300-
- *yarn_download
301-
- *yarn_install
302267

303268
- run: yarn gulp ci:build-release-packages
304269
- run: yarn check-release-output
@@ -351,8 +316,6 @@ jobs:
351316
- *attach_release_output
352317
- *setup_bazel_ci_config
353318
- *setup_bazel_remote_execution
354-
- *yarn_download
355-
- *yarn_install
356319
- *setup_bazel_binary
357320

358321
# CircleCI has a config setting to enforce SSH for all github connections.
@@ -380,8 +343,6 @@ jobs:
380343
- *restore_cache
381344
- *setup_bazel_ci_config
382345
- *setup_bazel_remote_execution
383-
- *yarn_download
384-
- *yarn_install
385346
- *setup_bazel_binary
386347

387348
- run: node ./scripts/circleci/setup-angular-snapshots.js --tag master
@@ -401,8 +362,6 @@ jobs:
401362
- *restore_cache
402363
- *setup_bazel_ci_config
403364
- *setup_bazel_remote_execution
404-
- *yarn_download
405-
- *yarn_install
406365
- *setup_bazel_binary
407366

408367
# Setup Angular ivy snapshots built with ngtsc but locked to a specific tag. We
@@ -433,8 +392,6 @@ jobs:
433392
- *restore_cache
434393
- *setup_bazel_ci_config
435394
- *setup_bazel_remote_execution
436-
- *yarn_download
437-
- *yarn_install
438395
- *setup_bazel_binary
439396

440397
# Setup Angular ivy snapshots built with ngtsc.
@@ -464,8 +421,6 @@ jobs:
464421
- *setup_bazel_binary
465422
- *setup_bazel_ci_config
466423
- *setup_bazel_remote_execution
467-
- *yarn_download
468-
- *yarn_install
469424

470425
- run: git clone ${MDC_REPO_URL} --branch ${MDC_REPO_BRANCH} --depth 1 ${MDC_REPO_TMP_DIR}
471426
- restore_cache:

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)