Skip to content

Commit 24596b5

Browse files
committed
fix(ci): circle ci fixes
1 parent c2943e8 commit 24596b5

File tree

5 files changed

+1427
-52
lines changed

5 files changed

+1427
-52
lines changed

.circleci/config.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,25 @@ jobs:
99
name: node/default
1010
steps:
1111
- checkout
12-
- node/install-packages:
13-
pkg-manager: yarn
12+
- restore_cache:
13+
key: v1-sa-{{ checksum "yarn.lock" }}
1414
- run:
15-
name: Install JUnit coverage reporter
16-
command: yarn add -W --dev jest-junit
15+
name: Yarn install
16+
command: yarn install --frozen-lockfile
17+
working_directory: ~/project
18+
- run:
19+
name: Compile ts
20+
command: yarn build
21+
working_directory: ~/project
22+
- save_cache:
23+
key: v1-sa-{{ checksum "yarn.lock" }}
24+
paths:
25+
- ~/project/node_modules
26+
- ~/project/*/node_modules
1727
- run:
1828
name: Run tests with JUnit as reporter
19-
command: yarn test --ci --reporters=default --reporters=jest-junit ../build
29+
command: yarn test --ci
30+
working_directory: ~/project/build
2031
environment:
2132
JEST_JUNIT_OUTPUT_DIR: ./reports/junit/
2233
- store_test_results:

jest.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ module.exports = {
3030
failuresOnly: true,
3131
},
3232
],
33+
'jest-junit'
3334
],
3435
roots: [
3536
'client/',

package.build.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"postinstall": "yarn workspace @secret-agent/mitm postinstall && yarn workspace @secret-agent/emulators postinstall"
99
},
1010
"devDependencies": {
11-
"jest": "^25.3.0",
12-
"jest-environment-node": "^25.3.0",
13-
"jest-junit": "^6.3.0",
11+
"jest": "^26.1.0",
1412
"jest-summary-reporter": "^0.0.2",
13+
"jest-environment-node": "^26.1.0",
14+
"jest-junit": "^6.3.0",
1515
"lerna": "^3.4.3",
1616
"rimraf": "^3.0.0",
1717
"source-map-support": "^0.5.16",

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
"watch": "tsc -b -w tsconfig.json",
1616
"watch:dist": "tsc -b -w tsconfig.dist.json",
1717
"clean": "tsc -b --clean tsconfig.json && yarn workspace @secret-agent/replay-app clean",
18-
"test": "yarn tsc && cd build && yarn test",
19-
"test-ci": "cross-env SA_SHOW_REPLAY=false NODE_ENV=test CACHE_DIR=.cache-test jest --ci --runInBand --no-cache"
18+
"test": "yarn tsc && cd build && yarn && yarn test"
2019
},
2120
"repository": "git@github.com:ulixee/secret-agent.git",
2221
"author": "Data Liberation Foundation",
@@ -42,8 +41,12 @@
4241
"devDependencies": {
4342
"@commitlint/cli": "^9.1.1",
4443
"@commitlint/config-conventional": "^9.1.1",
45-
"@types/jest": "^25.2.1",
44+
"@types/jest": "^26.0.5",
4645
"@types/node": "^12.7.11",
46+
"jest": "^26.1.0",
47+
"jest-summary-reporter": "^0.0.2",
48+
"jest-environment-node": "^26.1.0",
49+
"jest-junit": "^6.3.0",
4750
"copyfiles": "^2.3.0",
4851
"husky": "^4.2.5",
4952
"lerna": "^3.4.3",

0 commit comments

Comments
 (0)