Byron Hambly
e6f4e0f94a
Merge 3de5fcc94f into merged_master (Bitcoin PR bitcoin/bitcoin#24296 )
2023-07-01 07:21:42 +00:00
Byron Hambly
a8744fc1f4
Merge 5d254a234d into merged_master (Bitcoin PR bitcoin/bitcoin#24384 )
2023-07-01 06:14:05 +00:00
Byron Hambly
207c1ce338
Merge e0367e84b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24301 )
2023-06-30 15:43:32 +00:00
Byron Hambly
8719928e6e
Merge 87b5b002ad into merged_master (Bitcoin PR bitcoin/bitcoin#24259 )
2023-06-30 10:09:37 +00:00
Byron Hambly
4988afcbc2
Merge 3ace3a17c9 into merged_master (Bitcoin PR bitcoin/bitcoin#20744 )
2023-06-30 07:38:29 +00:00
Byron Hambly
898db1e7ec
Merge c194293883 into merged_master (Bitcoin PR bitcoin/bitcoin#24131 )
2023-06-30 07:11:22 +00:00
Byron Hambly
57a38b98cd
Merge 133f73e86b into merged_master (Bitcoin PR bitcoin/bitcoin#24212 )
2023-06-29 15:08:56 +00:00
Byron Hambly
b09ca8adf3
Merge a4f7c41271 into merged_master (Bitcoin PR bitcoin/bitcoin#21851 )
2023-06-29 08:45:25 +00:00
Byron Hambly
6d649c1782
Merge 63fc2f5cce into merged_master (Bitcoin PR bitcoin/bitcoin#24065 )
2023-06-20 12:24:24 +00:00
Byron Hambly
9e41d699ab
Merge 95833c012e into merged_master (Bitcoin PR bitcoin/bitcoin#23938 )
2023-06-15 12:55:56 +00:00
Byron Hambly
5c8aae9540
Merge 3e5dd94c42 into merged_master (Bitcoin PR bitcoin/bitcoin#23909 )
2023-06-15 07:13:25 +00:00
Byron Hambly
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +00:00
Byron Hambly
d82e5c7138
Merge 5d91133699 into merged_master (Bitcoin PR bitcoin/bitcoin#22815 )
2023-06-14 15:36:38 +00:00
Byron Hambly
3e256151e5
Merge 7551ae81e1 into merged_master (Bitcoin PR bitcoin/bitcoin#23845 )
2023-06-14 06:55:08 +00:00
Byron Hambly
93eb99c42c
Merge 97b2fc03f6 into merged_master (Bitcoin PR bitcoin/bitcoin#23803 )
2023-06-13 15:24:30 +00:00
Byron Hambly
085f710c02
Merge 1b76b18f8a into merged_master (Bitcoin PR bitcoin/bitcoin#23585 )
2023-06-06 10:01:57 +00:00
James Dorfman
51414e1a44
Merge 6db7e43d42 into merged_master (Bitcoin PR bitcoin/bitcoin#23677 )
2023-06-02 15:00:19 +00:00
James Dorfman
7d697c3b6e
Merge c9d7d0a653 into merged_master (Bitcoin PR bitcoin/bitcoin#23635 )
2023-06-01 06:00:22 +00:00
Byron Hambly
53bdca0c11
Merge 8b07145796 into merged_master (Bitcoin PR bitcoin/bitcoin#23597 )
2023-05-31 14:04:23 +00:00
Byron Hambly
2cf78f4b15
Merge ad09c287cb into merged_master (Bitcoin PR bitcoin/bitcoin#23504 )
2023-05-26 11:10:20 +00:00
James Dorfman
4a713e72bb
Merge aec631bccc into merged_master (Bitcoin PR bitcoin/bitcoin#23462 )
2023-05-24 20:35:27 +00:00
Byron Hambly
81d5607ec8
Merge c1fb30633b into merged_master (Bitcoin PR bitcoin/bitcoin#23114 )
2023-05-24 12:58:57 +00:00
Byron Hambly
e34dded367
Merge c86f546f98 into merged_master (Bitcoin PR bitcoin/bitcoin#23458 )
2023-05-17 11:53:56 +00:00
Byron Hambly
cb08328fbf
Merge ed40f37e00 into merged_master (Bitcoin PR bitcoin/bitcoin#22076 )
2023-05-17 11:15:32 +00:00
Byron Hambly
0cad2862de
Merge 77a2f5d30c into merged_master (Bitcoin PR bitcoin/bitcoin#23334 )
2023-05-17 09:41:17 +00:00
James Dorfman
a79aa023fe
Merge 3e3f53c77e into merged_master (Bitcoin PR bitcoin/bitcoin#23328 )
2023-05-14 07:22:16 +00:00
James Dorfman
be1fc7ead9
Merge a7f28af437 into merged_master (Bitcoin PR bitcoin/bitcoin#22646 )
2023-05-14 00:43:20 +00:00
Byron Hambly
31bb8332bc
Merge 3bf40d06a2 into merged_master (Bitcoin PR bitcoin/bitcoin#23212 )
2023-05-11 13:15:28 +00:00
Byron Hambly
a616d9aff6
Merge e504e9a8ed into merged_master (Bitcoin PR bitcoin/bitcoin#23286 )
2023-05-11 13:02:14 +00:00
Byron Hambly
cca3f919f8
Merge 9e530c6352 into merged_master (Bitcoin PR bitcoin/bitcoin#20487 )
2023-05-09 11:22:04 +00:00
Byron Hambly
b08c9ff55b
Merge 67eae69f3f into merged_master (Bitcoin PR bitcoin/bitcoin#23060 )
2023-04-26 11:03:13 +00:00
Byron Hambly
4756e1f59a
Merge 8f022a59b8 into merged_master (Bitcoin PR bitcoin/bitcoin#22993 )
2023-04-22 07:54:57 +00:00
James Dorfman
735e39231d
Merge e4ae0008d8 into merged_master (Bitcoin PR bitcoin/bitcoin#23014 )
2023-04-22 02:25:50 +00:00
Byron Hambly
9bb7d8f8d8
Merge 698b4b8fac into merged_master (Bitcoin PR bitcoin/bitcoin#22930 )
2023-04-21 12:26:22 +00:00
Byron Hambly
c44415a27c
Merge 87780dfee8 into merged_master (Bitcoin PR bitcoin/bitcoin#22994 )
2023-04-21 11:13:49 +00:00
James Dorfman
fbabb1c4e8
Merge 020c2b7609 into merged_master (Bitcoin PR bitcoin/bitcoin#22923 )
2023-04-21 05:08:04 +00:00
James Dorfman
9878769863
Merge e567dd53d1 into merged_master (Bitcoin PR bitcoin/bitcoin#22841 )
2023-04-20 21:21:22 +00:00
James Dorfman
3cace2f326
Merge 78d39f8438 into merged_master (Bitcoin PR bitcoin/bitcoin#22861 )
2023-04-20 20:38:04 +00:00
Byron Hambly
2334307d42
Merge 245462b66c into merged_master (Bitcoin PR bitcoin/bitcoin#22418 )
2023-04-13 12:10:09 +00:00
Byron Hambly
3e38acbb2a
Merge 19aa5afcae into merged_master (Bitcoin PR bitcoin/bitcoin#22744 )
2023-04-11 08:56:48 +00:00
Byron Hambly
b595ff1652
Merge 19364c0ddf into merged_master (Bitcoin PR bitcoin/bitcoin#20586 )
2023-04-11 08:09:44 +00:00
James Dorfman
58ec10be63
Merge fdd80b0a53 into merged_master (Bitcoin PR bitcoin/bitcoin#22688 )
2023-04-10 02:16:59 +00:00
James Dorfman
b5a37b0c9b
Merge 7fc9a45f47 into merged_master (Bitcoin PR bitcoin/bitcoin#22469 )
2023-03-16 16:06:33 +00:00
Glenn Willen
65bdef4b5f
Use git --no-pager in ci script.
...
When running 'git log' in a ci script, pass --no-pager to ensure
that a pager (i.e. 'less') is never used. When running in CI,
there is no controlling terminal, so a pager will never be used;
but when running the CI scripts by hand to reproduce CI issues,
the automatic invocation of a pager by 'git log' breaks the script.
2023-03-01 12:08:03 -08:00
Glenn Willen
6be157e26b
ci: Disable one of the fuzz tests to work around bitcoin#22233
2022-05-25 19:47:48 -07:00
Glenn Willen
db9faa3a38
ci: Swith from Centos 8 (EOL) to Centos Stream 8
...
Following upstream's lead, switch from the `centos:8` image, which is no
longer available, to Centos Stream 8, to fix a broken CI task.
2022-04-21 18:00:35 -07:00
MarcoFalke
3de5fcc94f
Merge bitcoin/bitcoin#24296 : ci: use Ubuntu Jammy for Windows cross-compilation CI
...
a1515cdd96https://packages.ubuntu.com/jammy/g++-mingw-w64 ) and [mingw-w64 8.0.0](https://packages.ubuntu.com/jammy/mingw-w64 ) which better matches our Guix release environment.
ACKs for top commit:
MarcoFalke:
cr ACK a1515cdd96a1515cdd96
2022-02-21 07:55:36 +01:00
fanquake
a1515cdd96
ci: use Ubuntu Jammy for Windows CI
...
This means we'll compile using GCC 10.3.x and mingw-w64 8.0.0 which
better matches our Guix release environment.
2022-02-18 15:19:05 +00:00
fanquake
7e02adf78d
ci: add missing sqlite_cflags to MSAN fuzz job
...
These are present in the other MSAN job.
2022-02-18 14:10:59 +00:00
fanquake
54d817c5b9
ci: remove boost_cxxflags from MSAN CIs
...
No-longer needed after #24301 .
2022-02-18 14:07:55 +00:00
