Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependencies: Update dependency ethers to v5 #2289

Merged
merged 17 commits into from
Nov 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 12 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

var_1: &docker_image raidennetwork/lightclient-node-pnpm:latest
var_2: &cache_key raiden-{{ .Branch }}-{{ checksum "pnpm-lock.yaml" }}
var_2: &cache_key raiden-{{ .Branch }}-{{ checksum "yarn.lock" }}
var_3: &working_dir ~/src
var_4: &dapp_working_dir ~/src/raiden-dapp

Expand Down Expand Up @@ -77,11 +77,10 @@ jobs:
steps:
- attach_workspace: *attach_options
- restore_cache: *package_lock_key
- run: pnpm install --prefer-frozen-lockfile
- run: yarn install
- save_cache:
<<: *package_lock_key
paths:
- ~/.pnpm-store
- ~/.cache # Cypress stores its stuff here.
- persist_to_workspace:
root: *working_dir
Expand All @@ -93,7 +92,7 @@ jobs:
working_directory: *working_dir
steps:
- attach_workspace: *attach_options
- run: pnpm run lint -r
- run: yarn lint

test_sdk_unit:
executor: base-executor
Expand All @@ -102,7 +101,7 @@ jobs:
- attach_workspace: *attach_options
- run:
name: Run unit tests
command: pnpm run test:unit --filter raiden-ts -- --ci --runInBand --reporters=default --reporters=jest-junit
command: yarn workspace raiden-ts run test:unit --ci --runInBand --reporters=default --reporters=jest-junit
environment:
JEST_JUNIT_OUTPUT_DIR: "reports/junit"
- store_test_results:
Expand All @@ -120,7 +119,7 @@ jobs:
- attach_workspace: *attach_options
- run:
name: Run unit tests
command: pnpm run test:integration --filter raiden-ts -- --ci --runInBand --reporters=default --reporters=jest-junit
command: yarn workspace raiden-ts run test:integration --ci --runInBand --reporters=default --reporters=jest-junit
environment:
JEST_JUNIT_OUTPUT_DIR: "reports/junit"
- store_test_results:
Expand All @@ -138,7 +137,7 @@ jobs:
- attach_workspace: *attach_options
- run:
name: Run unit tests
command: pnpm run test:unit --filter raiden-dapp -- --ci --runInBand --reporters=default --reporters=jest-junit
command: yarn workspace raiden-dapp run test:unit --ci --runInBand --reporters=default --reporters=jest-junit
environment:
JEST_JUNIT_OUTPUT_DIR: "reports/junit"
- store_test_results:
Expand All @@ -156,7 +155,7 @@ jobs:
- attach_workspace: *attach_options
- run:
name: Run e2e tests
command: pnpm run test:e2e --filter raiden-dapp -- --headless
command: yarn workspace raiden-dapp run test:e2e --headless
- store_test_results:
path: raiden-dapp/tests/e2e/results/reports
- store_artifacts:
Expand All @@ -170,7 +169,7 @@ jobs:
working_directory: *working_dir
steps:
- attach_workspace: *attach_options
- run: pnpm run build --filter raiden-ts
- run: yarn workspace raiden-ts build
- persist_to_workspace:
root: *working_dir
paths:
Expand All @@ -188,7 +187,7 @@ jobs:
- attach_workspace: *attach_options
- run:
name: Build dapp
command: pnpm run build --filter raiden-dapp -- --mode << parameters.mode >>
command: yarn workspace raiden-dapp build --mode << parameters.mode >>
- run:
name: Compress dapp
command: cd raiden-dapp && tar -czvf dapp.tar.gz dist
Expand All @@ -207,7 +206,7 @@ jobs:
- attach_workspace: *attach_options
- run:
name: Build CLI
command: pnpm run build --filter raiden-cli && pnpm run build:bundle --filter raiden-cli
command: yarn workspace raiden-cli run build && yarn workspace raiden-cli run build:bundle
- run:
name: Compress CLI bundle
command: >
Expand Down Expand Up @@ -253,7 +252,7 @@ jobs:
command: echo "//registry.npmjs.org/:_authToken=$NPM_AUTH_TOKEN" > ~/.npmrc
- run:
name: Publish on npm
command: pnpm publish --no-git-checks --filter raiden-ts
command: yarn workspace raiden-ts publish

test_sdk_e2e:
executor: e2e-environment-executor
Expand All @@ -264,7 +263,7 @@ jobs:
name: Run end-to-end tests
command: >
source /etc/profile.d/smartcontracts.sh &&
pnpm run test:e2e --filter raiden-ts --
yarn workspace raiden-ts run test:e2e --
--ci --runInBand --forceExit
--reporters=default --reporters=jest-junit
environment:
Expand Down
6 changes: 3 additions & 3 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extends": [
"config:base"
],
"commitMessagePrefix": "dependencies:",
"commitMessagePrefix": "deps:",
"packageRules": [
{
"packagePatterns": [
Expand All @@ -11,8 +11,7 @@
"updateTypes": ["minor", "patch", "pin", "digest", "lockFileMaintenance", "rollback", "bump"],
"groupName": "all non-major dependencies",
"groupSlug": "all-minor-patch",
"schedule": ["after 8am on thursday"],
"lockFileMaintenance": { "enabled": true }
"schedule": ["before 8am on thursday"]
},
{
"updateTypes": ["major"],
Expand All @@ -21,6 +20,7 @@
],
"masterIssue": true,
"labels": ["dependencies"],
"lockFileMaintenance": { "enabled": true },
"reviewers": ["team:raiden-network/light-client"],
"reviewersSampleSize": 1,
"rangeStrategy": "bump",
Expand Down
17 changes: 15 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
"doc": "docs"
},
"scripts": {
"preinstall": "npx only-allow pnpm"
"preinstall": "npx only-allow yarn",
"start": "yarn workspace raiden-ts build && yarn workspace raiden-dapp run serve",
"build": "yarn workspaces run build",
"lint": "yarn workspaces run lint",
"test": "yarn workspace raiden-ts test && yarn workspace raiden-dapp test",
"prepare": "rimraf ./node_modules/matrix-js-sdk/lib/*.d.ts && yarn workspace raiden-ts prepare"
},
"repository": {
"type": "git",
Expand All @@ -18,5 +23,13 @@
"bugs": {
"url": "https://github.com/raiden-network/light-client/issues"
},
"homepage": "https://github.com/raiden-network/light-client#readme"
"homepage": "https://github.com/raiden-network/light-client#readme",
"workspaces": [
"raiden-ts",
"raiden-dapp",
"raiden-cli"
],
"devDependencies": {
"rimraf": "^3.0.2"
}
}
Loading