Merge conflicts

jestjs · Dec 6, 2020 · f872520 · f872520
2 parents 0de3691 + cf4f0a5
commit f872520
Show file tree

Hide file tree

Showing 809 changed files with 15,647 additions and 22,736 deletions.
diff --git a/.azure-pipelines-steps.yml b/.azure-pipelines-steps.yml
@@ -6,11 +6,11 @@ steps:
   - checkout: self
     path: jest
 
-  # Ensure Node.js 12 is active
+  # Ensure Node.js 14 is active
   - task: NodeTool@0
     inputs:
-      versionSpec: '12.x'
-    displayName: 'Use Node.js 12'
+      versionSpec: '14.x'
+    displayName: 'Use Node.js 14'
 
   # Ensure Python 2.7 is active
   - task: UsePythonVersion@0
@@ -27,7 +27,7 @@ steps:
       path: $(yarnCache.folder)
     displayName: Cache Yarn packages
 
-  - script: yarn install
+  - script: yarn install --immutable
     displayName: 'Install dependencies'
 
   - script: yarn build:js

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ aliases:
       ignore: gh-pages
   - &install
     pkg-manager: yarn
-    override-ci-command: yarn install && yarn build:js
+    override-ci-command: yarn install --immutable && yarn build:js
     cache-path: ~/.yarn/berry/cache
     include-branch-in-cache-key: false
     app-dir: ~/jest
@@ -27,7 +27,7 @@ jobs:
       - store_test_results:
           path: reports/junit
 
-  test-jest-circus:
+  test-jest-jasmine:
     working_directory: ~/jest
     executor: node/default
     steps:
@@ -37,7 +37,7 @@ jobs:
           install-npm: false
       - node/install-packages: *install
       - run:
-          command: JEST_CIRCUS=1 yarn test-ci-partial && JEST_CIRCUS=1 yarn test-leak
+          command: JEST_JASMINE=1 yarn test-ci-partial && JEST_JASMINE=1 yarn test-leak
       - store_test_results:
           path: reports/junit
 
@@ -51,31 +51,31 @@ jobs:
           install-npm: false
       - node/install-packages: *install
       - run:
-          command: yarn test-ci
+          command: yarn test-ci-partial
       - store_test_results:
           path: reports/junit
 
-  test-node-13:
+  test-node-14:
     working_directory: ~/jest
     executor: node/default
     steps:
       - checkout
       - node/install:
-          node-version: '13'
+          node-version: '14'
           install-npm: false
       - node/install-packages: *install
       - run:
-          command: yarn test-ci-partial
+          command: yarn test-ci
       - store_test_results:
           path: reports/junit
 
-  test-node-14:
+  test-node-15:
     working_directory: ~/jest
     executor: node/default
     steps:
       - checkout
       - node/install:
-          node-version: '14'
+          node-version: '15'
           install-npm: false
       - node/install-packages: *install
       - run:
@@ -104,8 +104,8 @@ workflows:
     jobs:
       - test-node-10
       - test-node-12
-      - test-node-13
-      - test-node-14 # current
-      - test-jest-circus
+      - test-node-14
+      - test-node-15 # current
+      - test-jest-jasmine
       - test-or-deploy-website:
           filters: *filter-ignore-gh-pages
diff --git a/.circleci/website.sh b/.circleci/website.sh
@@ -13,7 +13,7 @@ else
         git config --global user.name "Website Deployment Script"
         echo "machine github.com login docusaurus-bot password $DOCUSAURUS_PUBLISH_TOKEN" > ~/.netrc
         # install Docusaurus and generate file of English strings
-        yarn && cd website && node fetchSupporters.js && yarn write-translations
+        yarn --immutable && cd website && node fetchSupporters.js && yarn write-translations
         # crowdin install
         sudo apt-get update
         sudo apt-get install default-jre rsync
@@ -30,6 +30,6 @@ else
         GIT_USER=docusaurus-bot USE_SSH=false yarn publish-gh-pages
     else
         echo "Skipping deploy. Test website build"
-        cd website && yarn && node fetchSupporters.js && yarn build
+        yarn --immutable && cd website && node fetchSupporters.js && yarn build
     fi
 fi