Skip to content

Commit

Permalink
Merge branch 'master' into node-prefix-esm
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Sep 8, 2021
2 parents 84964a0 + 831c3de commit 3a18ea3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .circleci/config.yml
Expand Up @@ -70,5 +70,6 @@ workflows:
partial: true
matrix:
parameters:
node-version: ['10', '12', '15', '16']
# https://github.com/nodejs/node/issues/40030
node-version: ['10', '12', '15', '16.8']
- test-jest-jasmine
3 changes: 2 additions & 1 deletion .github/workflows/nodejs.yml
Expand Up @@ -69,7 +69,8 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [10.x, 12.x, 14.x, 15.x, 16.x]
# https://github.com/nodejs/node/issues/40030
node-version: [10.x, 12.x, 14.x, 15.x, 16.8]
os: [ubuntu-latest, macOS-latest, windows-latest]
runs-on: ${{ matrix.os }}
needs: prepare-yarn-cache
Expand Down
2 changes: 1 addition & 1 deletion examples/mongodb/setup.js
Expand Up @@ -18,7 +18,7 @@ module.exports = async () => {

const mongoConfig = {
mongoDBName: 'jest',
mongoUri: await mongod.getConnectionString(),
mongoUri: await mongod.getUri(),
};

// Write global config to disk because all tests run in different contexts.
Expand Down

0 comments on commit 3a18ea3

Please sign in to comment.