Skip to content

Commit

Permalink
Merge branch 'trunk' into snyk-upgrade-eb1b8f9293bc5711c084e3e34cd6ece8
Browse files Browse the repository at this point in the history
  • Loading branch information
delagroove authored Dec 1, 2021
2 parents b22d6e9 + db5e365 commit 8d574da
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 26 deletions.
21 changes: 21 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,23 @@ jobs:

- run: npm run lint

test-integration:
docker:
- image: circleci/node:14.11.0-stretch
# Integration tests need MongoDB server running and accessible on port 27017
- image: circleci/mongo:4.2.0
command: mongod --oplogSize 128 --replSet rs0 --storageEngine=wiredTiger
ports:
- "27017:27017"
steps:
- checkout
- run:
name: Run Integration Tests
environment:
MONGO_URL: mongodb://localhost:27017/test
MONGO_USE_UNIFIED_TOPOLOGY: false
command: npx --quiet --package @reactioncommerce/[email protected] run-integration-tests

test:
docker:
- image: node:12.14.1
Expand Down Expand Up @@ -75,11 +92,15 @@ workflows:
- test:
requires:
- build
- test-integration:
requires:
- build
- deploy:
context: reaction-publish-semantic-release
requires:
- lint
- test
- test-integration
filters:
branches:
only: trunk
40 changes: 16 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
},
"sideEffects": false,
"dependencies": {
"@reactioncommerce/api-utils": "^1.16.5",
"@reactioncommerce/logger": "^1.1.4",
"@reactioncommerce/api-utils": "^1.16.9",
"@reactioncommerce/logger": "^1.1.3",
"@reactioncommerce/random": "^1.0.2",
"@reactioncommerce/reaction-error": "^1.0.1",
"simpl-schema": "^1.12.0"
Expand Down

0 comments on commit 8d574da

Please sign in to comment.