Commit graph

127 commits

Author SHA1 Message Date
ivanlele
aa9999ecc9
Merge 03cff2c142 into merged_master (Bitcoin PR bitcoin/bitcoin#31191) 2026-04-02 12:03:05 +00:00
ivanlele
1bad1a5a50
Merge 4a0251c05d into merged_master (Bitcoin PR bitcoin/bitcoin#31187) 2026-04-02 10:20:45 +00:00
Tom Trevethan
1244d0d5a3 Merge 6e21dedbf2 into merged_master (Bitcoin PR bitcoin/bitcoin#31130) 2026-04-01 13:36:19 +01:00
ivanlele
2b76be3d70 Merge dd92911732 into merged_master (Bitcoin PR bitcoin/bitcoin#31148) 2026-03-30 16:09:44 +00:00
ivanlele
9124c0ba02
Merge 03696bb1bd into merged_master (Bitcoin PR bitcoin/bitcoin#31045) 2026-03-30 09:50:42 +00:00
ivanlele
1f6c8b929f
Merge c33eb2360e into merged_master (Bitcoin PR bitcoin/bitcoin#30043) 2026-03-27 11:35:17 +00:00
ivanlele
2c1e5ba88a
Merge 6b97882ab5 into merged_master (Bitcoin PR bitcoin/bitcoin#30915) 2026-03-26 14:48:33 +00:00
ivanlele
a1165f28a2
Merge bdbc90f29a into merged_master (Bitcoin PR bitcoin/bitcoin#30902) 2026-03-26 13:40:45 +00:00
ivanlele
9e7eadd52a
Merge bbf95c0cc5 into merged_master (Bitcoin PR bitcoin/bitcoin#30755) 2026-03-25 10:30:14 +00:00
ivanlele
c9b157ccbf
Merge ab317ad2ef into merged_master (Bitcoin PR bitcoin/bitcoin#30804) 2026-03-24 14:35:57 +00:00
ivanlele
3e1f02dfb1
Merge e96f657e20 into merged_master (Bitcoin PR bitcoin/bitcoin#30777) 2026-03-23 13:54:38 +00:00
ivanlele
aac2f08e1d
Merge 5c7d4b9dec into merged_master (Bitcoin PR bitcoin/bitcoin#30749) 2026-03-23 12:42:43 +00:00
ivanlele
b7904c0e23
Merge 00ad716c2b into merged_master (Bitcoin PR bitcoin/bitcoin#30740) 2026-03-23 12:23:27 +00:00
ikripaka
e667e1c50b
Merge 338bc2cd26 into merged_master (Bitcoin PR bitcoin/bitcoin#30454) 2026-03-20 13:12:00 +00:00
ivanlele
94692c02e7
Merge fc699abcab into merged_master (Bitcoin PR bitcoin/bitcoin#30591) 2026-03-12 15:15:00 +00:00
ivanlele
c19ac14af4
Merge f66738f79c into merged_master (Bitcoin PR bitcoin/bitcoin#30542) 2026-03-10 15:01:53 +00:00
ikripaka
e7329ada4e
Merge 45f757c726 into merged_master (Bitcoin PR bitcoin/bitcoin#29274) 2026-03-05 15:48:31 +00:00
ivanlele
484e0da9bf
Merge cf44adfd9f into merged_master (Bitcoin PR bitcoin/bitcoin#30310) 2026-03-02 12:32:34 +00:00
ivanlele
a0c414482b
Merge 5fbdfe7104 into merged_master (Bitcoin PR bitcoin/bitcoin#30299) 2026-03-02 10:34:44 +00:00
Tom Trevethan
26abe59c3b Merge d97ddbe797 into merged_master (Bitcoin PR bitcoin/bitcoin#30193) 2026-03-02 00:10:40 +00:00
Tom Trevethan
bbbe4ff788 Merge dc4eca4073 into merged_master (Bitcoin PR bitcoin/bitcoin#30242) 2026-02-26 01:19:14 +00:00
ivanlele
e79664cf3b
Merge 42d5a1ff25 into merged_master (Bitcoin PR bitcoin/bitcoin#30060) 2026-02-20 14:12:05 +00:00
ivanlele
0cf164e807
Merge 3aaf7328eb into merged_master (Bitcoin PR bitcoin/bitcoin#29774) 2026-02-19 09:39:53 +00:00
ivanlele
e90b6e505e
Merge b8420e4603 into merged_master (Bitcoin PR bitcoin/bitcoin#29764) 2026-02-17 10:58:17 +00:00
ivanlele
e2b8af57e2
Merge d14c7286b6 into merged_master (Bitcoin PR #29620) 2026-02-13 13:18:14 +00:00
ivanlele
7b9745ebe1
Merge bd55b7a528 into merged_master (Bitcoin PR #29610) 2026-02-13 13:18:07 +00:00
Byron Hambly
f7bfef44d8
ci: fix for macos job boost 1.85 2025-12-11 15:47:17 +02:00
Byron Hambly
98f6d2e900
depends: use archive url for qt 5 2025-12-11 15:47:07 +02:00
merge-script
479b9908a9
Merge bitcoin/bitcoin#30913: ci: Use macos-14 GHA image (x86_64-apple-darwin22.6.0 -> arm64-apple-darwin23.6.0)
fab932b421 ci: Remove incorrectly hardcoded HOST in mac_native task (MarcoFalke)
fa8f35d786 ci: Use macos-14 GHA image (MarcoFalke)

Pull request description:

  There shouldn't be any downside, because XCode remains pinned to the same version.

  However, builds are expected to be a bit faster with M1, which seems nice.

ACKs for top commit:
  hebasto:
    ACK fab932b421.
  willcl-ark:
    ACK fab932b421

Tree-SHA512: 9719e05c67b8b5f3d59bd1a38eef00407b1ae5e123b18151c494b6d2dbf55bd2b0b5bb6c1a0469635c7b3bb5f23990d3bb2f339f56ce3955e8a1b97ac9f295d4
(cherry picked from commit a95e742b69)
2025-12-11 14:46:31 +02:00
Byron Hambly
cbc64320bc
Merge 0fa9f17332 into merged_master (Bitcoin PR bitcoin/bitcoin#29535) 2025-12-04 15:39:25 +02:00
Byron Hambly
82ca8e9a3a
Merge 8e894bec90 into merged_master (Bitcoin PR bitcoin/bitcoin#29504) 2025-12-04 10:54:12 +02:00
Byron Hambly
de29c7af52
Merge 7699a1aab8 into merged_master (Bitcoin PR bitcoin/bitcoin#29313) 2025-11-28 15:22:44 +02:00
Byron Hambly
494e62c39c
Merge 9e1306fc88 into merged_master (Bitcoin PR bitcoin/bitcoin#29195) 2025-11-18 08:50:10 +02:00
Byron Hambly
1a218cdfd8
Merge e6dbf48c64 into merged_master (Bitcoin PR bitcoin/bitcoin#29080) 2025-11-17 15:39:43 +02:00
Byron Hambly
b4affdd9c8
Merge a7484be65f into merged_master (Bitcoin PR bitcoin/bitcoin#29059) 2025-11-17 15:16:03 +02:00
Byron Hambly
cbf5635798
Merge 3e691258d8 into merged_master (Bitcoin PR bitcoin/bitcoin#28349) 2025-11-11 15:40:10 +02:00
Byron Hambly
bbb8cc46e8
Merge c1b7332441 into merged_master (Bitcoin PR bitcoin/bitcoin#28934) 2025-11-11 09:31:37 +02:00
Byron Hambly
4342043da6
Merge 640b450530 into merged_master (Bitcoin PR bitcoin/bitcoin#28925) 2025-11-10 14:44:10 +02:00
Byron Hambly
e097fb6be6
Merge daa56f7f66 into merged_master (Bitcoin PR bitcoin/bitcoin#28905) 2025-11-10 14:44:00 +02:00
Byron Hambly
4d2d7184bb
Merge 3d7544b481 into merged_master (Bitcoin PR bitcoin/bitcoin#28823) 2025-11-06 10:41:17 +02:00
Byron Hambly
b62deb6769
Merge d2d53b4ac8 into merged_master (Bitcoin PR bitcoin/bitcoin#28796) 2025-11-06 08:44:18 +02:00
Byron Hambly
64b51fed27
Merge 023e8c2001 into merged_master (Bitcoin PR bitcoin/bitcoin#28769) 2025-11-05 19:19:09 +02:00
Byron Hambly
210e6f64f5
ci: fix macos github action
use boost@1.85 for macos on github actions
2025-08-22 09:22:39 +02:00
Ryan Ofsky
03cff2c142
Merge bitcoin/bitcoin#31191: build: Make G_FUZZING constexpr, require -DBUILD_FOR_FUZZING=ON to fuzz
fafbf8acf4 Make G_FUZZING constexpr, require -DBUILD_FOR_FUZZING=ON to execute a fuzz target (MarcoFalke)
fae3cf0ffa ci: Temporarily disable macOS/Windows fuzz step (MarcoFalke)

Pull request description:

  `g_fuzzing` is used inside `Assume` at runtime, causing significant overhead in hot paths. See https://github.com/bitcoin/bitcoin/issues/31178

  One could simply remove the `g_fuzzing` check from the `Assume`, but this would make fuzzing a bit less useful. Also, it would be unclear if `g_fuzzing` adds a runtime overhead in other code paths today or in the future.

  Fix all issues by making `G_FUZZING` equal to the build option `BUILD_FOR_FUZZING`, and for consistency in fuzzing, require it to be set when executing any fuzz target.

  Fixes https://github.com/bitcoin/bitcoin/issues/31178

  Temporarily this drops fuzzing from two CI tasks, but they can be re-added in a follow-up with something like https://github.com/bitcoin/bitcoin/pull/31073

ACKs for top commit:
  marcofleon:
    Tested ACK fafbf8acf4
  davidgumberg:
    I still ACK https://github.com/bitcoin/bitcoin/pull/31191/commits/fafbf8acf419d5e2ca307e5804099361ca7471af for fixing the regression measured in #31178.
  ryanofsky:
    Code review ACK fafbf8acf4 but approach -0, because this approach means libraries built for fuzz testing do not function correctly if used in a release, and libraries built for releases are mostly useless for fuzz testing. So I would like to at least consider other solutions to this problem even if we go with this one.
  dergoegge:
    utACK fafbf8acf4

Tree-SHA512: 124fc2e8b35e0c4df414436556a7a0a36cd1bec4b3000b40dcf2ab8c85f32e0610bf7f70d2fd79223d62f3c3665b6c09da21241654c7b9859461b8ca340d5421
2024-11-05 06:05:27 -05:00
MarcoFalke
fae3cf0ffa
ci: Temporarily disable macOS/Windows fuzz step
The fuzz binary is still compiled. This is required for the next commit.
2024-10-31 13:51:13 +01:00
Sergi Delgado Segura
54d07dd37d ci: Do not error on unused-member-function in test each commit 2024-10-30 13:58:52 -04:00
Antoine Poinsot
94ad614482
ci: remove UPnP options 2024-10-25 09:27:12 -04:00
furszy
8523d8c0fc
ci: display logs of failed tests automatically 2024-10-24 10:36:02 -03:00
MarcoFalke
fa1cffacae
ci: Install missing nproc in macos task
This avoids special-casing macos
2024-10-07 12:28:23 +02:00
MarcoFalke
faf7a2bccc
ci: Add missing -DWERROR=ON to test-each-commit 2024-10-07 12:28:23 +02:00