Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
6707e01
chore: add more memory to node image for circleci
rodrigopavezi Dec 5, 2024
07ebaf9
test: change trigger to run next release in the current branch
rodrigopavezi Dec 5, 2024
d122efa
fix: ci trigger
rodrigopavezi Dec 5, 2024
4f5eb7e
chore: revert test
rodrigopavezi Dec 5, 2024
b3fcbde
chore: remove --canary from next release
rodrigopavezi Dec 5, 2024
8c5a243
fix: improve ci
rodrigopavezi Dec 6, 2024
1fde94a
fix: syntax issu
rodrigopavezi Dec 6, 2024
827d998
fix: build with lerna
rodrigopavezi Dec 6, 2024
7a1a993
fix: run lint and build before tests only once
rodrigopavezi Dec 6, 2024
a3f9ecb
fix: install
rodrigopavezi Dec 6, 2024
62fe275
fix: build contracts
rodrigopavezi Dec 6, 2024
619615a
fix: build all before deploying test contracts
rodrigopavezi Dec 6, 2024
573e8c2
fix: lint call
rodrigopavezi Dec 6, 2024
7c28604
fix: lint again
rodrigopavezi Dec 6, 2024
e082d6e
fix: build smart contract dependecies first only
rodrigopavezi Dec 6, 2024
bf473d8
fix: change resource class
rodrigopavezi Dec 6, 2024
7e34e6e
revert: build all
rodrigopavezi Dec 6, 2024
c563bc5
fix: performance
rodrigopavezi Dec 6, 2024
9312fca
fix: tests
rodrigopavezi Dec 6, 2024
52f2fbc
fix: test for lit provider
rodrigopavezi Dec 6, 2024
f6182ff
fix: package lint
rodrigopavezi Dec 6, 2024
559b602
fix: include integration tests to nightly run
rodrigopavezi Dec 6, 2024
25a6656
fix: revert test-nightly
rodrigopavezi Dec 9, 2024
1bcc4f6
fix: resource_class for test nightly
rodrigopavezi Dec 9, 2024
ec07577
fix: per review suggestions
rodrigopavezi Dec 9, 2024
f29351f
Update .circleci/config.yml
rodrigopavezi Dec 9, 2024
0dc6d3f
fix: require tests before doing a next release
rodrigopavezi Dec 9, 2024
9e0d297
Merge branch 'fix/next-release' of https://github.com/RequestNetwork/…
rodrigopavezi Dec 9, 2024
77f4031
fix: test reports
rodrigopavezi Dec 9, 2024
dff9da1
fix: lint
rodrigopavezi Dec 9, 2024
5fea3f2
fix: eslint by ignoring specs
rodrigopavezi Dec 9, 2024
f64ebf8
Merge branch 'master' into fix/next-release
rodrigopavezi Dec 9, 2024
9e65353
fix: revert include
rodrigopavezi Dec 9, 2024
14c58f9
Merge branch 'fix/next-release' of https://github.com/RequestNetwork/…
rodrigopavezi Dec 9, 2024
01d4af8
Remove unused anchors
MantisClone Dec 9, 2024
fd5d178
Split long lines into multi lines
MantisClone Dec 10, 2024
5384939
Use new yarn deploy:contracts script
MantisClone Dec 10, 2024
683efd7
Rename test steps
MantisClone Dec 10, 2024
f8f850f
fix: test results reporting
rodrigopavezi Dec 10, 2024
4b5338f
fix: multiple line command
rodrigopavezi Dec 10, 2024
6bd11ca
fix: syntax issue
rodrigopavezi Dec 10, 2024
5db9b2a
fix: test reporting
rodrigopavezi Dec 10, 2024
7c3836e
test: store_test_results path
rodrigopavezi Dec 10, 2024
629d90e
chore: update store_test_results paths in CircleCI config for multipl…
rodrigopavezi Dec 10, 2024
6ac59b7
chore: update lerna publish scripts in package.json for improved rele…
rodrigopavezi Dec 10, 2024
e8c8179
Update package.json
rodrigopavezi Dec 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: performance
  • Loading branch information
rodrigopavezi committed Dec 6, 2024
commit c563bc5641b6b512fc7d18a3cc4321cfad5cf69e
95 changes: 54 additions & 41 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ references:
done
echo Failed waiting for Node initialization && exit 1
jobs:
install:
build:
docker:
- *node_image
resource_class: large
resource_class: xlarge
working_directory: *working_directory
steps:
- checkout
Expand All @@ -78,7 +78,9 @@ jobs:
key: yarn-packages-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn

- run:
name: Build all packages with lerna
command: 'yarn build --since master'
- persist_to_workspace:
root: *working_directory
paths:
Expand All @@ -96,35 +98,17 @@ jobs:
- run:
name: 'lint package.json files'
command: 'yarn run packageJsonLint'
test:
test-unit:
docker:
- *node_image
- *ipfs_image
- *ganache_image
- *postgres_image
- *graph_image
resource_class: xlarge
working_directory: *working_directory
steps:
- attach_workspace:
at: *working_directory
- run:
name: 'Build all packages with lerna'
command: 'yarn build --concurrency=10'
- run:
name: 'Deploy test contract from smart-contracts'
command: 'yarn workspace @requestnetwork/smart-contracts run deploy'
- run: *step_graph_deploy
- run:
name: 'Start request-node'
command: 'yarn start:request-node'
background: true
- run: *step_wait_for_node
- run:
name: 'Test all'
command: 'yarn test --concurrency=10'
- store_test_results:
path: packages/integration-test/reports/
name: 'Test unit'
command: 'yarn test --since master --ignore @requestnetwork/smart-contracts --ignore @requestnetwork/payment-detection --ignore @requestnetwork/payment-processor --ignore @requestnetwork/integration-test'
- store_test_results:
path: packages/lit-protocol-cipher/reports/
- store_test_results:
Expand All @@ -133,18 +117,12 @@ jobs:
path: packages/request-logic/reports/
- store_test_results:
path: packages/request-node/reports/
- store_test_results:
path: packages/smart-contracts/reports/
- store_test_results:
path: packages/transaction-manager/reports/
- store_test_results:
path: packages/epk-signature/reports/
- store_test_results:
path: packages/web3-signature/reports/
- store_test_results:
path: packages/payment-detection/reports/
- store_test_results:
path: packages/payment-processor/reports/
- store_test_results:
path: packages/advanced-logic/reports/
- store_test_results:
Expand All @@ -161,6 +139,38 @@ jobs:
path: packages/utils/reports/
- store_test_results:
path: packages/multi-format/reports/
test-integration:
docker:
- *node_image
- *ipfs_image
- *ganache_image
- *postgres_image
- *graph_image
resource_class: xlarge
working_directory: *working_directory
steps:
- attach_workspace:
at: *working_directory
- run:
name: 'Deploy test contract from smart-contracts'
command: 'yarn workspace @requestnetwork/smart-contracts run deploy'
- run: *step_graph_deploy
- run:
name: 'Start request-node'
command: 'yarn start:request-node'
background: true
- run: *step_wait_for_node
- run:
name: 'Test all'
command: 'yarn test --since master --scope @requestnetwork/smart-contracts --scope @requestnetwork/payment-detection --scope @requestnetwork/payment-processor --scope @requestnetwork/integration-test'
- store_test_results:
path: packages/integration-test/reports/
- store_test_results:
path: packages/smart-contracts/reports/
- store_test_results:
path: packages/payment-detection/reports/
- store_test_results:
path: packages/payment-processor/reports/
test-usage-examples:
docker:
- *node_image
Expand Down Expand Up @@ -220,24 +230,27 @@ workflows:
## Lerna will run lit, build and test
build-and-test:
jobs:
- install
- test:
- build
- test-unit:
requires:
- install
- lint:
- build
- test-integration:
requires:
- test
- build
- test-usage-examples:
requires:
- test
- build
- test-toolbox:
requires:
- test
- build
- lint:
requires:
- build

# Release a next version package everytime we merge to master
- next-release:
requires:
- test
- build
context: protocol-release
filters:
branches:
Expand All @@ -254,7 +267,7 @@ workflows:
only:
- master
jobs:
- install
- test:
- build
- test-unit:
requires:
- install
- build
17 changes: 9 additions & 8 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{
"tasksRunnerOptions": {
"default": {
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["build", "test", "lint:check"]
}
"runner": "nx/tasks-runners/default"
}
},
"targetDefaults": {
"lint:check": {
"dependsOn": ["^lint:check"]
"dependsOn": ["^lint:check"],
"cache": true
},
"build": {
"dependsOn": ["^build", "lint:check"]
"dependsOn": ["^build", "lint:check"],
"cache": true
},
"test": {
"dependsOn": ["build"]
"dependsOn": ["build"],
"cache": true
},
"clean": {
"dependsOn": ["^clean"]
"dependsOn": ["^clean"],
"cache": true
}
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"publish-prerelease": "yarn lerna publish --preid development --skip-git --yes --canary",
"deploy:contracts": "yarn workspace @requestnetwork/smart-contracts deploy",
"start:request-node": "yarn workspace @requestnetwork/request-node start",
"test": "lerna run test --concurrency=1",
"test": "lerna run test",
"format": "prettier . -w",
"format:check": "prettier . -c",
"link:all": "for d in packages/*; do cd $d; yarn link; cd -; done",
Expand Down