From edb7fa96d30dff4b649ce7ad8dda71a0391502ac Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 26 Jan 2019 16:09:58 +0100 Subject: [PATCH 1/4] chore(ci): run yarn with `frozen-lockfile` --- .azure-pipelines-steps.yml | 2 +- .travis.yml | 2 ++ appveyor.yml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines-steps.yml b/.azure-pipelines-steps.yml index e2b59742d827..d786455f6bff 100644 --- a/.azure-pipelines-steps.yml +++ b/.azure-pipelines-steps.yml @@ -26,7 +26,7 @@ steps: displayName: 'Move source into jest folder' # Run yarn to install dependencies and build - - script: yarn + - script: yarn --frozen-lockfile workingDirectory: $(JEST_DIR) displayName: 'Install dependencies and build' diff --git a/.travis.yml b/.travis.yml index a16d00d6e1f6..345d27a0ba46 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ before_install: - curl -o- -L https://yarnpkg.com/install.sh | bash - export PATH="$HOME/.yarn/bin:$PATH" +install: yarn --frozen-lockfile + cache: yarn: true directories: diff --git a/appveyor.yml b/appveyor.yml index 2c9d0ccebbd9..676053f77124 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ init: install: - ps: Install-Product node $env:nodejs_version x64 - node --version - - yarn + - yarn --frozen-lockfile cache: - node_modules From c69faf0cc2402611f08c82906ca9602b91ab65d8 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 26 Jan 2019 16:55:54 +0100 Subject: [PATCH 2/4] circle --- .circleci/config.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e23f16e19ce5..d92680b8ce51 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ jobs: steps: - checkout - restore-cache: *restore-cache - - run: yarn --no-progress + - run: yarn --no-progress --frozen-lockfile - save-cache: *save-cache - run: yarn lint --format junit -o reports/junit/js-lint-results.xml && yarn typecheck && yarn lint-es5-build --format junit -o reports/junit/js-es5-lint-results.xml && yarn lint:md:ci && yarn check-copyright-headers - store_test_results: @@ -37,7 +37,7 @@ jobs: steps: - checkout - restore-cache: *restore-cache - - run: yarn --no-progress --ignore-engines + - run: yarn --no-progress --ignore-engines --frozen-lockfile - save-cache: *save-cache - run: # react-native does not work with node 6 @@ -52,7 +52,7 @@ jobs: steps: - checkout - restore-cache: *restore-cache - - run: yarn --no-progress + - run: yarn --no-progress --frozen-lockfile - save-cache: *save-cache - run: command: yarn test-ci-partial @@ -66,7 +66,7 @@ jobs: steps: - checkout - restore-cache: *restore-cache - - run: yarn --no-progress + - run: yarn --no-progress --frozen-lockfile - save-cache: *save-cache - run: command: yarn test-ci @@ -80,7 +80,7 @@ jobs: steps: - checkout - restore-cache: *restore-cache - - run: yarn --no-progress + - run: yarn --no-progress --frozen-lockfile - save-cache: *save-cache - run: command: JEST_CIRCUS=1 yarn test-ci-partial @@ -94,7 +94,7 @@ jobs: steps: - checkout - restore-cache: *restore-cache - - run: yarn --no-progress + - run: yarn --no-progress --frozen-lockfile - save-cache: *save-cache - run: command: yarn test-ci-partial @@ -108,7 +108,7 @@ jobs: steps: - checkout - restore-cache: *restore-cache - - run: yarn --no-progress + - run: yarn --no-progress --frozen-lockfile - save-cache: *save-cache - run: yarn test-ci-es5-build-in-browser @@ -120,7 +120,7 @@ jobs: steps: - checkout - restore-cache: *restore-cache - - run: yarn --no-progress + - run: yarn --no-progress --frozen-lockfile - save-cache: *save-cache - run: name: Test or Deploy Jest Website From 9856d6294e06998d084002f1e7b89e3333f9ea31 Mon Sep 17 00:00:00 2001 From: Tim Seckinger Date: Sat, 26 Jan 2019 17:32:00 +0100 Subject: [PATCH 3/4] Update .circleci/config.yml Co-Authored-By: SimenB --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d92680b8ce51..ac6bc7a650de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -37,7 +37,7 @@ jobs: steps: - checkout - restore-cache: *restore-cache - - run: yarn --no-progress --ignore-engines --frozen-lockfile + - run: yarn --no-progress --frozen-lockfile --ignore-engines - save-cache: *save-cache - run: # react-native does not work with node 6 From d39271056e809fbbc9ef5581d42325c103adf5d3 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 26 Jan 2019 22:14:13 +0100 Subject: [PATCH 4/4] make flow 1 worker on ci --- .circleci/config.yml | 1 + .flowconfig | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac6bc7a650de..44cae7e80065 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,6 +26,7 @@ jobs: - restore-cache: *restore-cache - run: yarn --no-progress --frozen-lockfile - save-cache: *save-cache + - run: echo server.max_workers=1 >> .flowconfig - run: yarn lint --format junit -o reports/junit/js-lint-results.xml && yarn typecheck && yarn lint-es5-build --format junit -o reports/junit/js-es5-lint-results.xml && yarn lint:md:ci && yarn check-copyright-headers - store_test_results: path: reports/junit diff --git a/.flowconfig b/.flowconfig index 2f3a6859ee9f..21c130eb2c80 100644 --- a/.flowconfig +++ b/.flowconfig @@ -4,13 +4,6 @@ .*/node_modules/metro/.* .*/node_modules/module-deps/.* -[options] -module.name_mapper='^pretty-format$' -> '/packages/pretty-format/src/index.js' -module.name_mapper='^types/\(.*\)$' -> '/types/\1.js' -module.name_mapper='\(jest-[^/]*\)' -> '/packages/\1/src/index.js' -include_warnings=true -emoji=true - [strict] nonstrict-import unclear-type @@ -20,3 +13,10 @@ untyped-type-import [version] ^0.91.0 + +[options] +module.name_mapper='^pretty-format$' -> '/packages/pretty-format/src/index.js' +module.name_mapper='^types/\(.*\)$' -> '/types/\1.js' +module.name_mapper='\(jest-[^/]*\)' -> '/packages/\1/src/index.js' +include_warnings=true +emoji=true