Skip to content

Commit 86df01b

Browse files
chore: fix circle ci build and test on master (#1527)
1 parent efcf1c6 commit 86df01b

File tree

3 files changed

+28
-14
lines changed

3 files changed

+28
-14
lines changed

.circleci/config.yml

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
build:
6161
docker:
6262
- *node_image
63-
resource_class: large
63+
resource_class: xlarge
6464
working_directory: *working_directory
6565
steps:
6666
- checkout
@@ -78,11 +78,14 @@ jobs:
7878
- ~/.cache/yarn
7979
- run:
8080
name: Build all packages with lerna
81-
command: 'yarn build --since master'
81+
command: 'yarn build'
8282
- persist_to_workspace:
8383
root: *working_directory
8484
paths:
8585
- ./
86+
- ./.nx-cache
87+
- packages/*/dist
88+
- packages/*/*.tsbuildinfo
8689
lint:
8790
docker:
8891
- *node_image
@@ -108,12 +111,14 @@ jobs:
108111
name: 'Test unit'
109112
command: |
110113
yarn test \
111-
--since master \
114+
--ignore @requestnetwork/request-node \
115+
--ignore @requestnetwork/ethereum-storage \
112116
--ignore @requestnetwork/request-client.js \
113117
--ignore @requestnetwork/smart-contracts \
114118
--ignore @requestnetwork/payment-detection \
115119
--ignore @requestnetwork/payment-processor \
116-
--ignore @requestnetwork/integration-test
120+
--ignore @requestnetwork/integration-test \
121+
--concurrency=2
117122
- store_test_results:
118123
path: packages/advance-logic/reports/
119124
- store_test_results:
@@ -126,16 +131,12 @@ jobs:
126131
path: packages/epk-cipher/reports/
127132
- store_test_results:
128133
path: packages/epk-decryption/reports/
129-
- store_test_results:
130-
path: packages/ethereum-storage/reports/
131134
- store_test_results:
132135
path: packages/lit-protocol-cipher/reports/
133136
- store_test_results:
134137
path: packages/multi-format/reports/
135138
- store_test_results:
136139
path: packages/request-logic/reports/
137-
- store_test_results:
138-
path: packages/request-node/reports/
139140
- store_test_results:
140141
path: packages/thegraph-data-access/reports/
141142
- store_test_results:
@@ -152,7 +153,7 @@ jobs:
152153
- *ganache_image
153154
- *postgres_image
154155
- *graph_image
155-
resource_class: large
156+
resource_class: xlarge
156157
working_directory: *working_directory
157158
steps:
158159
- attach_workspace:
@@ -165,11 +166,15 @@ jobs:
165166
name: 'Test request-client.js, smart-contracts, payment-detection and payment-processor'
166167
command: |
167168
yarn test \
168-
--since master \
169+
--scope @requestnetwork/request-node \
170+
--scope @requestnetwork/ethereum-storage \
169171
--scope @requestnetwork/request-client.js \
170172
--scope @requestnetwork/smart-contracts \
171173
--scope @requestnetwork/payment-detection \
172-
--scope @requestnetwork/payment-processor
174+
--scope @requestnetwork/payment-processor \
175+
--concurrency=1
176+
- store_test_results:
177+
path: packages/request-node/reports/
173178
- store_test_results:
174179
path: packages/request-client.js/reports/
175180
- store_test_results:
@@ -178,6 +183,8 @@ jobs:
178183
path: packages/payment-detection/reports/
179184
- store_test_results:
180185
path: packages/payment-processor/reports/
186+
- store_test_results:
187+
path: packages/ethereum-storage/reports/
181188
test-integration-with-request-node:
182189
docker:
183190
- *node_image
@@ -203,7 +210,6 @@ jobs:
203210
name: 'Test integration-test'
204211
command: |
205212
yarn test \
206-
--since master \
207213
--scope @requestnetwork/integration-test
208214
- store_test_results:
209215
path: packages/integration-test/reports/
@@ -274,6 +280,9 @@ jobs:
274280
- run:
275281
name: 'Authenticate with registry'
276282
command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
283+
- run:
284+
name: 'Build all packages with lerna'
285+
command: 'yarn build --skip-nx-cache'
277286
- run:
278287
name: 'Publish'
279288
command: |

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,6 @@ tsconfig.build.tsbuildinfo
4141
/packages/smart-contracts/types/
4242
/packages/smart-contracts/src/types/
4343
/packages/smart-contracts/build-zk/
44-
/packages/smart-contracts/cache-zk/
44+
/packages/smart-contracts/cache-zk/
45+
46+
.nx-cache/

nx.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
"default": {
44
"runner": "nx/tasks-runners/default",
55
"options": {
6-
"cacheableOperations": ["build", "test", "lint:check"]
6+
"cacheableOperations": ["build", "test", "lint:check"],
7+
"cacheDirectory": ".nx-cache",
8+
"parallel": 3,
9+
"fileHashVersion": 2
710
}
811
}
912
},

0 commit comments

Comments
 (0)