Skip to content

Updating Yarn Cache path to fix broken CI #32834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cortinico wants to merge 12 commits into from
Closed

Updating Yarn Cache path to fix broken CI #32834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
908edf3
Updating Yarn Cache path to fix broken CI
cortinico Jan 5, 2022
cde0570
Bump Yarn Cache Key
cortinico Jan 5, 2022
73420a9
Bump Yarn Cache key
cortinico Jan 5, 2022
adde8d7
Add .Environment.CIRCLE_JOB to the Cache Key
cortinico Jan 6, 2022
ea2dea1
.Environment.CIRCLE_JOB should have a higher priority
cortinico Jan 6, 2022
e06c8bb
Do not restore on `v6-yarn-cache-` only
cortinico Jan 6, 2022
c56a2b3
Remove malformed_package_json before flow check
cortinico Jan 6, 2022
17718a3
Fix eslint
cortinico Jan 6, 2022
4e7aa6e
Revert to ~/.cache/yarn
cortinico Jan 6, 2022
80c4bbe
Revert to v5
cortinico Jan 6, 2022
8e50226
rm inside local node_modules
cortinico Jan 6, 2022
b8f3da2
Unsplit a line
cortinico Jan 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ commands:
steps:
- restore_cache:
keys:
- v5-yarn-cache-{{ arch }}-{{ checksum "yarn.lock" }}
- v5-yarn-cache-{{ .Environment.CIRCLE_JOB }}-{{ arch }}-{{ checksum "yarn.lock" }}
- v5-yarn-cache-{{ .Environment.CIRCLE_JOB }}-{{ arch }}
- v5-yarn-cache-{{ .Environment.CIRCLE_JOB }}
- run:
name: "Yarn: Install Dependencies"
command: |
Expand All @@ -90,7 +92,7 @@ commands:
- save_cache:
paths:
- ~/.cache/yarn
key: v5-yarn-cache-{{ arch }}-{{ checksum "yarn.lock" }}
key: v5-yarn-cache-{{ .Environment.CIRCLE_JOB }}-{{ arch }}-{{ checksum "yarn.lock" }}

install_buck_tooling:
steps:
Expand Down
5 changes: 4 additions & 1 deletion scripts/run-ci-e2e-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* --retries [num] - how many times to retry possible flaky commands: yarn add and running tests, default 1
*/

const {cd, cp, echo, exec, exit, mv} = require('shelljs');
const {cd, cp, echo, exec, exit, mv, rm} = require('shelljs');
const spawn = require('child_process').spawn;
const argv = require('yargs').argv;
const path = require('path');
Expand Down Expand Up @@ -265,6 +265,9 @@ try {
throw Error(exitCode);
}
describe('Test: Flow check');
// The resolve package included a test for a malformed package.json (see https://github.com/browserify/resolve/issues/89)
// that is failing the flow check. We're removing it.
rm('-rf', './node_modules/resolve/test/resolver/malformed_package_json');
if (exec(`${ROOT}/node_modules/.bin/flow check`).code) {
echo('Flow check failed.');
exitCode = 1;
Expand Down