Skip to content

Commit d13eeca

Browse files
author
Brian Vaughn
committed
Bump Node cache version in Circle YML
1 parent 0c282f7 commit d13eeca

File tree

2 files changed

+12
-23
lines changed

2 files changed

+12
-23
lines changed

.circleci/config.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ aliases:
1010
- &restore_yarn_cache
1111
restore_cache:
1212
name: Restore yarn cache
13-
key: v2-node-{{ arch }}-{{ checksum "yarn.lock" }}-yarn
13+
key: v3-node-{{ arch }}-{{ checksum "yarn.lock" }}-yarn
1414

1515
- &restore_node_modules
1616
restore_cache:
1717
name: Restore node_modules cache
1818
keys:
19-
- v2-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ checksum "workspace_info.txt" }}-node-modules
19+
- v3-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ checksum "workspace_info.txt" }}-node-modules
2020

2121
- &TEST_PARALLELISM 20
2222

@@ -53,7 +53,7 @@ jobs:
5353
# checksum. This will speed up the setup job for all PRs where the
5454
# lockfile is the same.
5555
name: Save yarn cache for future installs
56-
key: v2-node-{{ arch }}-{{ checksum "yarn.lock" }}-yarn
56+
key: v3-node-{{ arch }}-{{ checksum "yarn.lock" }}-yarn
5757
paths:
5858
- ~/.cache/yarn
5959
- save_cache:
@@ -62,7 +62,7 @@ jobs:
6262
# all jobs run on this branch with the same lockfile.
6363
name: Save node_modules cache
6464
# This cache key is per branch, a yarn install in setup is required.
65-
key: v2-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ checksum "workspace_info.txt" }}-node-modules
65+
key: v3-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ checksum "workspace_info.txt" }}-node-modules
6666
paths:
6767
- node_modules
6868

@@ -171,9 +171,9 @@ jobs:
171171
- run:
172172
name: Download artifacts for base revision
173173
command: |
174-
git fetch origin main
174+
git fetch origin master
175175
cd ./scripts/release && yarn && cd ../../
176-
scripts/release/download-experimental-build.js --commit=$(git merge-base HEAD origin/main)
176+
scripts/release/download-experimental-build.js --commit=$(git merge-base HEAD origin/master)
177177
mv ./build2 ./base-build
178178
- persist_to_workspace:
179179
root: .
@@ -356,7 +356,7 @@ jobs:
356356
- run:
357357
name: Run publish script
358358
command: |
359-
git fetch origin main
359+
git fetch origin master
360360
cd ./scripts/release && yarn && cd ../../
361361
scripts/release/prepare-release-from-ci.js --skipTests -r << parameters.release_channel >> --commit=<< parameters.commit_sha >>
362362
cp ./scripts/release/ci-npmrc ~/.npmrc
@@ -414,7 +414,7 @@ workflows:
414414
filters:
415415
branches:
416416
only:
417-
- main
417+
- master
418418

419419
# New workflow that will replace "stable" and "experimental"
420420
build_and_test:
@@ -491,14 +491,14 @@ workflows:
491491
filters:
492492
branches:
493493
ignore:
494-
- main
494+
- master
495495
requires:
496496
- setup
497497
- sizebot:
498498
filters:
499499
branches:
500500
ignore:
501-
- main
501+
- master
502502
requires:
503503
- get_base_build
504504
- yarn_build_combined
@@ -514,7 +514,7 @@ workflows:
514514
filters:
515515
branches:
516516
only:
517-
- main
517+
- master
518518
jobs:
519519
- setup
520520
- test_fuzz:
@@ -555,7 +555,7 @@ workflows:
555555
filters:
556556
branches:
557557
only:
558-
- main
558+
- master
559559
jobs:
560560
- setup
561561
- publish_prerelease:

scripts/jest/jest-cli.js

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -321,17 +321,6 @@ function main() {
321321
)
322322
);
323323

324-
if (argv.project === 'devtools') {
325-
console.log(
326-
chalk.blue(`\nRe-installing Yarn dependencies to invalidate cache...`)
327-
);
328-
329-
spawnSync('yarn install', {
330-
stdio: 'inherit',
331-
cwd: path.join(__dirname, '..', '..'),
332-
});
333-
}
334-
335324
// Print the release channel and project we're running for quick confirmation.
336325
console.log(
337326
chalk.blue(

0 commit comments

Comments
 (0)