Commit graph

29954 commits

Author SHA1 Message Date
MarcoFalke
3333d6942e
ci: Run macos ci config on cirrus 2020-11-09 10:15:59 +01:00
MarcoFalke
fa8b1114e6
ci: Run arm ci config on cirrus 2020-11-09 10:15:50 +01:00
MarcoFalke
fa0795f54d
ci: Replace TRAVIS_OS_NAME with CI_OS_NAME
Also enable free disk space check unconditionally
2020-11-09 10:15:48 +01:00
MarcoFalke
fafce1a13a
ci: Move documentation to correct config file 2020-11-09 10:15:13 +01:00
Andrew Poelstra
a50b652932 Merge 735d6b57e7 into merged_master (Bitcoin PR #16227) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
18ed97642c Merge 28d1353f48 into merged_master (Bitcoin PR #15649) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
082a6486a0 Merge 4fcccdac78 into merged_master (Bitcoin PR #16244) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
8a94b6b2cb Merge ff0aad8a40 into merged_master (Bitcoin PR #16361) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
7774f13936 Merge 6c1e45c4c4 into merged_master (Bitcoin PR #16322) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
473365d335 Merge d1fc827300 into merged_master (Bitcoin PR #16270) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
b1bb63f321 Merge 5859b7dc6f into merged_master (Bitcoin PR #16338) 2020-11-09 03:58:21 +00:00
Andrew Poelstra
0065d674a4 Merge 8d1286014c into merged_master (Bitcoin PR #16237)
I'm sorry, this should have been a few commits, but it got away from me
as the scope of this refactoring was not immediately obvious. It essentially
just moves code around so hopefully is not too hard to review. --asp
2020-11-09 03:58:21 +00:00
Andrew Poelstra
f11c2f3dab Merge 357488f660 into merged_master (Bitcoin PR #16240) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
7a36a783eb Merge 8046a3e0be into merged_master (Bitcoin PR #16348) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
69dd3ef807 Merge c799976c86 into merged_master (Bitcoin PR #16128) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
f245eedfcc Merge 345f42a9e3 into merged_master (Bitcoin PR #14505) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
80e17c78a6 Merge 0a6ee9797e into merged_master (Bitcoin PR #16267) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
15f0fb459f Merge 4882040182 into merged_master (Bitcoin PR #16291) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
7b057423a8 Merge 2679bb8919 into merged_master (Bitcoin PR #16106) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
2cfd0717bc Merge b5fa2319d8 into merged_master (Bitcoin PR #15687) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
843c77a2ff Merge 983c84844c into merged_master (Bitcoin PR #16352) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
946d9c1f6c Merge f5a01cf259 into merged_master (Bitcoin PR #16332) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
8e3404b818 Merge e1a8d76aff into merged_master (Bitcoin PR #16347) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
1d9458e988 Merge 2b465195e0 into merged_master (Bitcoin PR #16339) 2020-11-09 03:58:20 +00:00
Andrew Poelstra
f485cc6f02 Merge 05623c0216 into merged_master (Bitcoin PR #16350) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
f7cb3a9645 Merge f373beebbc into merged_master (Bitcoin PR #16344) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
2687bdb94a Merge 584168c7f9 into merged_master (Bitcoin PR #16326) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
62a63e4c6b Merge 8c69fae944 into merged_master (Bitcoin PR #15457) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
05fc6f4b27 Merge 4f378ac30c into merged_master (Bitcoin PR #16308) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
13fa126076 Merge 1088b90cba into merged_master (Bitcoin PR #16327) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
b615fa5ad9 Merge dfdcb3dfe5 into merged_master (Bitcoin PR #16330) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
3845f53ef3 Merge 1381ddbcfc into merged_master (Bitcoin PR #16329) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
f30bcf51c4 Merge 91c345eb92 into merged_master (Bitcoin PR #16299)
Easiest way to build this without a clean build is to first run
rm src/bench/data/block413567.raw.h
--asp
2020-11-09 03:58:19 +00:00
Andrew Poelstra
7bcd9637cf Merge 11de669d8b into merged_master (Bitcoin PR #16325) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
c755b376d1 Merge 9339008a9d into merged_master (Bitcoin PR #15483) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
c0b3c94838 Merge 085cac6b90 into merged_master (Bitcoin PR #14734) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
fb10ea6389 Merge 38fbb575e2 into merged_master (Bitcoin PR #16294) 2020-11-09 03:58:19 +00:00
Andrew Poelstra
82e0dbf362 Merge 7f985d6c81 into merged_master (Bitcoin PR #16158) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
0e2c963dbf Merge 7d7b832d67 into merged_master (Bitcoin PR #16262) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
5faac4d177 Merge e06067387e into merged_master (Bitcoin PR #16250) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
6995beb983 Merge b9727ae60c into merged_master (Elements PR #673) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
41182b6c23 Merge 4db2f8cf0f into merged_master (Bitcoin PR #16153) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
9f26fe6ceb Merge 9bc016f460 into merged_master (Elements PR #669) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
29431d0295 Merge c84349a148 into merged_master (Bitcoin PR #16314) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
16a3be0fc8 Merge 2f717fb5cd into merged_master (Bitcoin PR #15427) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
19568c3891 Merge c6e42f1ca9 into merged_master (Bitcoin PR #14193) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
f76becf687 Merge 6c21a801f3 into merged_master (Bitcoin PR #15538) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
abb6fd103b Merge 3ccab6470a into merged_master (Bitcoin PR #16212) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
1750fbd46c Merge 545836e5b1 into merged_master (Elements PR #655) 2020-11-09 03:58:18 +00:00
Andrew Poelstra
a0f003eb6e Merge 51a89c80dd into merged_master (Elements PR #671) 2020-11-09 03:58:17 +00:00