Skip to content

Commit

Permalink
Merge branch 'main' into failing-test-not-yet-fulfilled
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB authored Sep 14, 2023
2 parents e1fa70b + b522b03 commit a6156c1
Show file tree
Hide file tree
Showing 2,900 changed files with 141,984 additions and 73,604 deletions.
46 changes: 0 additions & 46 deletions .azure-pipelines-steps.yml

This file was deleted.

36 changes: 0 additions & 36 deletions .azure-pipelines.yml

This file was deleted.

37 changes: 13 additions & 24 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,63 +12,52 @@ aliases:
app-dir: ~/jest

orbs:
node: circleci/node@4.0.0
node: circleci/node@5.1.0

jobs:
test-node:
parameters:
node-version:
type: string
partial:
type: boolean
default: false
working_directory: ~/jest
executor: node/default
parallelism: 4
steps:
- checkout
- node/install:
node-version: << parameters.node-version >>
install-npm: false
- node/install-packages: *install
- when:
condition: << parameters.partial >>
steps:
- run:
command: yarn test-ci-partial
- unless:
condition: << parameters.partial >>
steps:
- run:
command: yarn test-ci
- run:
command: yarn test-ci-partial --shard=$(expr $CIRCLE_NODE_INDEX + 1)/$CIRCLE_NODE_TOTAL
- store_test_results:
path: reports/junit

test-jest-jasmine:
working_directory: ~/jest
executor: node/default
parallelism: 4
steps:
- checkout
- node/install:
lts: true
install-npm: false
node-version: lts/*
- node/install-packages: *install
- run:
command: JEST_JASMINE=1 yarn test-ci-partial && JEST_JASMINE=1 yarn test-leak
name: Test
command: JEST_JASMINE=1 yarn test-ci-partial --shard=$(expr $CIRCLE_NODE_INDEX + 1)/$CIRCLE_NODE_TOTAL
- run:
name: Leak test
command: JEST_JASMINE=1 yarn test-leak
- store_test_results:
path: reports/junit

# Workflows enables us to run multiple jobs in parallel
workflows:
build-and-deploy:
jobs:
- test-node:
matrix:
parameters:
node-version: ['14']
- test-node:
name: test-node-partial-<< matrix.node-version >>
partial: true
matrix:
parameters:
node-version: ['10', '12', '15', '16']
# For some reason, v20 fails to run yarn install…
node-version: ['14', '16', '18', '19']
- test-jest-jasmine
13 changes: 13 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
codecov:
require_ci_to_pass: false

comment: false

coverage:
status:
patch:
default:
target: auto
project:
default:
target: auto
13 changes: 9 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
!.*
**/coverage/**
**/node_modules/**
bin/
flow-typed/**
packages/*/build/**
packages/jest-diff/src/cleanupSemantic.ts
packages/*/dist/**
website/.docusaurus
website/blog
website/build
website/node_modules
website/i18n/*.js
website/static
!.eslintrc.js

# Third-party script
packages/jest-diff/src/cleanupSemantic.ts

**/.yarn
**/.pnp.*

10 changes: 7 additions & 3 deletions .eslintplugin/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
Expand All @@ -9,6 +9,10 @@ exports.rules = {
'ban-types-eventually': require('@typescript-eslint/eslint-plugin').rules[
'ban-types'
],
'prefer-rest-params-eventually': require('eslint/lib/rules/prefer-rest-params'),
'prefer-spread-eventually': require('eslint/lib/rules/prefer-spread'),
'prefer-rest-params-eventually':
require('eslint/use-at-your-own-risk').builtinRules.get(
'prefer-rest-params',
),
'prefer-spread-eventually':
require('eslint/use-at-your-own-risk').builtinRules.get('prefer-spread'),
};
Loading

0 comments on commit a6156c1

Please sign in to comment.