Open
Conversation
# Conflicts: # packages/config-manager/index.d.ts # packages/config-manager/lib/index.js # packages/config-manager/src/predefined.ts
merge develop into ckb2021
merge develop: ckb-indexer into CKB2021
# Conflicts: # Makefile
# Conflicts: # packages/base/lib/utils.js # packages/base/package.json # packages/ckb-indexer/package.json # packages/common-scripts/package.json # packages/config-manager/package.json # packages/hd-cache/package.json # packages/hd/package.json # packages/helpers/package.json # packages/indexer/package.json # packages/rpc/package.json # packages/sql-indexer/package.json # packages/testkit/package.json # yarn.lock
chore: sync ckb2021 with develop
# Conflicts: # examples/omni-lock-metamask/package.json # examples/pw-lock-metamask/package.json # lerna.json # packages/base/package.json # packages/bi/package.json # packages/ckb-indexer/package.json # packages/common-scripts/package.json # packages/config-manager/package.json # packages/hd-cache/package.json # packages/hd/package.json # packages/helpers/package.json # packages/indexer/package.json # packages/lumos/package.json # packages/rpc/package.json # packages/sql-indexer/package.json # packages/testkit/package.json # packages/toolkit/package.json # packages/transaction-manager/package.json
chore: sync develop into ckb2021
ci: add publish ckb2021 workflow
…ckb2021 test: fix ckb indexer e2e test ckb2021
fix(testkit): wrong private and version setting in package.json
This reverts commit ea5032f.
Codecov Report
@@ Coverage Diff @@
## split-e2e-and-unit-test #45 +/- ##
===========================================================
- Coverage 76.12% 75.95% -0.18%
===========================================================
Files 57 57
Lines 18366 18684 +318
Branches 1532 1566 +34
===========================================================
+ Hits 13981 14191 +210
- Misses 4369 4476 +107
- Partials 16 17 +1
Continue to review full report at Codecov.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.