Skip to content

Commit

Permalink
Merge branch 'master' into circus-add-test-while-running
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Nov 9, 2019
2 parents 2a2fb98 + 17f6fb7 commit 5c85971
Show file tree
Hide file tree
Showing 472 changed files with 16,855 additions and 11,022 deletions.
15 changes: 9 additions & 6 deletions .azure-pipelines-steps.yml
Expand Up @@ -9,8 +9,8 @@ steps:
# Ensure Node.js 10 is active
- task: NodeTool@0
inputs:
versionSpec: '10.x'
displayName: 'Use Node.js 10'
versionSpec: '12.x'
displayName: 'Use Node.js 12'

# Ensure Python 2.7 is active
- task: UsePythonVersion@0
Expand All @@ -22,11 +22,14 @@ steps:
- script: node scripts/remove-postinstall
displayName: 'Remove postinstall script'

- script: yarn --no-progress --frozen-lockfile
displayName: 'Install dependencies'
- task: CacheBeta@0
inputs:
key: yarn | $(Agent.OS) | yarn.lock
path: $(YARN_CACHE_FOLDER)
displayName: Cache Yarn packages

- script: node scripts/build
displayName: 'Build'
- script: yarn install-no-ts-build
displayName: 'Install dependencies'

# Run test-ci-partial
- script: yarn run test-ci-partial
Expand Down
2 changes: 2 additions & 0 deletions .azure-pipelines.yml
Expand Up @@ -34,3 +34,5 @@ variables:

# Ensures the handful of tests that should be skipped during CI are
CI: true

YARN_CACHE_FOLDER: $(Pipeline.Workspace)/.yarn
29 changes: 22 additions & 7 deletions .circleci/config.yml
Expand Up @@ -14,14 +14,14 @@ aliases:
- &filter-ignore-gh-pages
branches:
ignore: gh-pages
- &install node scripts/remove-postinstall && yarn --no-progress --frozen-lockfile --ignore-engines && node scripts/build
- &install yarn install-no-ts-build

version: 2
jobs:
lint-and-typecheck:
working_directory: ~/jest
docker:
- image: circleci/node:10
- image: circleci/node:12
steps:
- checkout
- restore-cache: *restore-cache
Expand Down Expand Up @@ -55,14 +55,14 @@ jobs:
- run: *install
- save-cache: *save-cache
- run:
command: yarn test-ci
command: yarn test-ci-partial
- store_test_results:
path: reports/junit

test-jest-circus:
working_directory: ~/jest
docker:
- image: circleci/node:10
- image: circleci/node:12
steps:
- checkout
- restore-cache: *restore-cache
Expand All @@ -77,6 +77,20 @@ jobs:
working_directory: ~/jest
docker:
- image: circleci/node:12
steps:
- checkout
- restore-cache: *restore-cache
- run: *install
- save-cache: *save-cache
- run:
command: yarn test-ci
- store_test_results:
path: reports/junit

test-node-13:
working_directory: ~/jest
docker:
- image: circleci/node:13
steps:
- checkout
- restore-cache: *restore-cache
Expand All @@ -90,7 +104,7 @@ jobs:
test-browser:
working_directory: ~/jest
docker:
- image: circleci/node:10-browsers
- image: circleci/node:12-browsers
steps:
- checkout
- restore-cache: *restore-cache
Expand All @@ -101,7 +115,7 @@ jobs:
test-or-deploy-website:
working_directory: ~/jest
docker:
- image: circleci/node:10
- image: circleci/node:12
resource_class: large
steps:
- checkout
Expand All @@ -120,7 +134,8 @@ workflows:
- lint-and-typecheck
- test-node-8
- test-node-10
- test-node-12 # current
- test-node-12
- test-node-13 # current
- test-jest-circus
- test-browser
- test-or-deploy-website:
Expand Down
1 change: 1 addition & 0 deletions .eslintrc.js
Expand Up @@ -105,6 +105,7 @@ module.exports = {
],
},
],
'import/no-unresolved': [2, {ignore: ['fsevents']}],
// This has to be disabled until all type and module imports are combined
// https://github.com/benmosher/eslint-plugin-import/issues/645
'import/order': 0,
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,7 +1,7 @@
language: node_js

node_js:
- '10'
- 'lts/*'

branches:
only:
Expand All @@ -11,7 +11,7 @@ before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH="$HOME/.yarn/bin:$PATH"

install: node scripts/remove-postinstall && yarn --no-progress --frozen-lockfile --ignore-engines && node scripts/build
install: yarn install-no-ts-build

cache:
yarn: true
Expand Down

0 comments on commit 5c85971

Please sign in to comment.