Repository navigation
[32.x] Backports - #44
Merged
Merged
Conversation
Document how maintenance branches are created and what they may receive: only backports and branch specific fixes, never a fast-forward to master. The latter happened to 31.x, which as a result picked up submitBlock() (not part of Bitcoin Core 31.x) and lost its CI configuration, see 2140-dev#35. Github-Pull: 2140-dev#36 Rebased-From: 94b2b73
Github-Pull: 2140-dev#33 Rebased-From: 2dd5740
Github-Pull: 2140-dev#33 Rebased-From: a80fd45
nproc is not available on macOS. Use getconf instead and pass the job count via --parallel. A bare --parallel is avoided because it means unlimited jobs with the Makefile generator. Rebased-From: ee5128b
Zero the stats restored with the cache, so the numbers reflect only this run. Rebased-From: 92eec7f
v4 targets the deprecated Node.js 20 runtime. Rebased-From: b718ae9
v4 targets the deprecated Node.js 20 runtime. Rebased-From: 70f15da
The uptime RPC returns whole seconds, so it is 0 when the test runs within a second of node startup. This happens more often now that contrib/run-tests.sh starts the node right before the tests. Fixes 2140-dev#37 Github-Pull: 2140-dev#38 Rebased-From: 8fc3c8b
`mining_check_block_and_interrupt` calls interrupt() while nothing is waiting, so it only checks that the call doesn't fail. Rename it to `mining_check_block`. Github-Pull: 2140-dev#41 Rebased-From: 909aed9
Call `waitTipChanged` and `waitNext` with no timeout, let them block in a local task, then check that `interrupt` and `interruptWait` unblock them. Github-Pull: 2140-dev#41 Rebased-From: f3f1f8f
run-tests.sh started the node on the default datadir, so it reused whatever regtest state was already there and left its own behind. Start it on a fresh `/tmp/capnp-type-tests` instad, recreated on every run, and pass it to the tests as `BITCOIN_DATADIR`. Github-Pull: 2140-dev#40 Rebased-From: 369245b
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
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.
Backports test, CI and doc changes from
masterto32.x. No schema changes, so the published0.3.0crate is unaffected and no new release is needed.Backported
contrib/run-tests.sh, and run CI through itrpc_query_uptimemaster:run-tests.shmacOS fix, ccache stats,actions/cachev6,actions/checkoutv7Each commit keeps its original author and carries
Github-Pull:/Rebased-From:trailers, asRELEASE_POLICY.mdrequires. Commits pushed directly tomasteronly haveRebased-From:.Conflicts
94b2b73(RELEASE_POLICY.md): tookmaster's version, so the file is now identical on both branches.a80fd45(ci.yml): kept the32.xpush/pull_request triggers and the Bitcoin Core32.xcheckout.Skipped
b32b3ad(map32.xto0.3.x), already done in #43.After this,
32.xdiffers frommasteronly in those CI branch lines and the crate version.Testing
21/21 tests pass via
contrib/run-tests.shagainst Bitcoin Core built from thev32.0tag.