Tom Trevethan
c1c9b145b7
Merge a44ccedcc2 into merged_master (Bitcoin PR bitcoin/bitcoin#31818 )
2026-04-15 13:41:13 +01:00
ivanlele
9decd13df6
Merge 85224f92d5 into merged_master (Bitcoin PR bitcoin/bitcoin#30811 )
2026-04-02 12:40:02 +00:00
ivanlele
00716a7dc4
Merge f3c74c4a7e into merged_master (Bitcoin PR bitcoin/bitcoin#30989 )
2026-03-27 11:09:32 +00:00
ivanlele
221f1d9928
Merge 3ee1521c04 into merged_master (Bitcoin PR bitcoin/bitcoin#30730 )
2026-03-23 13:42:23 +00:00
ikripaka
e667e1c50b
Merge 338bc2cd26 into merged_master (Bitcoin PR bitcoin/bitcoin#30454 )
2026-03-20 13:12:00 +00:00
ivanlele
0117d6fe10
Merge bacab1380e into merged_master (Bitcoin PR bitcoin/bitcoin#30609 )
2026-03-12 13:26:05 +00:00
ivanlele
eda7ebceba
Merge 2401a24387 into merged_master (Bitcoin PR bitcoin/bitcoin#30452 )
2026-03-10 15:35:18 +00:00
ivanlele
40cefd4554
Merge 4c62f4b535 into merged_master (Bitcoin PR bitcoin/bitcoin#30451 )
2026-03-10 15:07:54 +00:00
ivanlele
1143a434d1
Merge 337f9d44c2 into merged_master (Bitcoin PR bitcoin/bitcoin#30201 )
2026-02-26 11:33:54 +00:00
Tom Trevethan
c386134c5c
Merge 2ad6e8efa3 into merged_master (Bitcoin PR bitcoin/bitcoin#30231 )
2026-02-26 00:39:58 +00:00
ivanlele
7e96d13e79
Merge be100cf4c7 into merged_master (Bitcoin PR bitcoin/bitcoin#21778 )
2026-02-24 12:26:19 +00:00
ivanlele
e484c33612
Merge 5c10d12e77 into merged_master (Bitcoin PR bitcoin/bitcoin#29828 )
2026-02-18 11:02:55 +00:00
ivanlele
89558eebed
Merge 71c51c161d into merged_master (Bitcoin PR bitcoin/bitcoin#29673 )
2026-02-17 14:29:11 +00:00
ivanlele
aff69d7511
Merge 3900854ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#29797
...
#29648 )
2026-02-17 14:16:58 +00:00
ivanlele
e16f945a4d
Merge 3b12fc7bcd into merged_master (Bitcoin PR bitcoin/bitcoin#29787
...
#29648 )
2026-02-17 13:52:20 +00:00
ivanlele
d304142cbf
Merge 82b47cb52b into merged_master (Bitcoin PR bitcoin/bitcoin#29733 )
2026-02-17 13:31:44 +00:00
Byron Hambly
491900cffd
Merge 72b7c4646b into merged_master (Elements PR #1509 )
2026-01-06 20:13:53 +02:00
Byron Hambly
df11e01f49
Merge d7995d8a56 into merged_master (Elements PR #1503 )
2026-01-06 16:08:54 +02:00
Byron Hambly
59948613a9
Merge c840dea27e into merged_master (Bitcoin PR bitcoin/bitcoin#29078 )
2025-11-17 19:17:14 +02:00
Byron Hambly
1c0951fe18
Merge c4d47d2c22 into merged_master (Bitcoin PR bitcoin/bitcoin#26077 )
2025-11-11 11:20:47 +02:00
Byron Hambly
1b75de9c23
Merge 5800c558eb into merged_master (Bitcoin PR bitcoin/bitcoin#28580 )
2025-11-06 11:38:19 +02:00
Byron Hambly
9c53116cae
Merge 697ded943c into merged_master (Bitcoin PR bitcoin/bitcoin#28757 )
2025-11-05 17:59:50 +02:00
Byron Hambly
710207546a
Merge e9a4793b82 into merged_master (Bitcoin PR bitcoin/bitcoin#28432 )
2025-08-01 14:05:39 +02:00
Byron Hambly
1f0a83f3bd
Merge 03675b2ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#28328 )
2025-07-05 15:42:49 +02:00
Byron Hambly
8182a98c75
Merge 8e7179aa13 into merged_master (Bitcoin PR bitcoin/bitcoin#27345 )
2025-04-12 10:17:43 +02:00
Thomas Trevethan
2e74f169db
Merge f4e42a78c7 into merged_master (Bitcoin PR bitcoin/bitcoin#27179 )
2025-04-11 14:54:10 +01:00
Byron Hambly
54025896c4
Merge fe1b325688 into merged_master (Bitcoin PR bitcoin/bitcoin#27029 )
2025-04-06 21:44:29 +02:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Hennadii Stepanov
e182058ad0
guix: Use "win64" for Windows artifacts consistently
...
Github-Pull: #24549
Rebased-From: 53dd6165b8
2025-03-10 13:33:03 +00:00
Hennadii Stepanov
513c001fab
guix: Drop "-signed" suffix for signed macOS .dmg files
...
This change makes naming of the signed artifacts consistent across
different OSes, including Windows.
Github-Pull: #24549
Rebased-From: 4b4b04a66d
2025-03-10 11:52:24 +00:00
Hennadii Stepanov
fd2a5b7a4e
guix: Use $HOST instead of generic osx{64} for macOS artifacts
...
Github-Pull: #24549
Rebased-From: 933a43018f
2025-03-10 11:52:05 +00:00
Byron Hambly
d804a76d50
Merge 0fe225e378 into merged_master (Bitcoin PR bitcoin/bitcoin#26470 )
2025-03-03 15:09:32 +02:00
fanquake
76c090145e
guix: remove test-security/symbol-check scripts
...
These scripts are becoming more of nuisance, than a value-add;
particularly since we've been building releases using Guix. Adding new
(release bin) tests can be harder, because it requires constructing a
failing test, which is becoming less easy e.g trying to disable a
feature or protection that has been built into the compiler/toolchain by
default.
In the pre-Guix days, these were valuable to sanity-check the environment,
because we were pulling that pre-built from Ubuntu, with little control.
At this point, it's less clear what these scripts are (sanity) checking.
Note that these also weren't completely ported to CMake (#31698 ), see
also #31715 which contains other fixes that would be needed for these
test-tests, to accomodate future changes.
2025-02-10 11:12:33 +01:00
Byron Hambly
ed3a451efb
Merge 995fdef14a into merged_master (Bitcoin PR bitcoin/bitcoin#26059 )
2024-11-26 13:36:21 +02:00
Hennadii Stepanov
788c1324f3
build: Unify -logsourcelocations format
2024-11-04 11:30:43 +00:00
Byron Hambly
0f2eb6fd58
Merge aa774f3e11 into merged_master (Bitcoin PR bitcoin/bitcoin#25829 )
2024-11-03 15:50:57 +02:00
James Dorfman
1e00030f3f
Merge b04f42efe3 into merged_master (Bitcoin PR bitcoin/bitcoin#25490 )
2024-10-09 05:39:30 +00:00
Hennadii Stepanov
f1daa80521
guix: Drop no longer needed PATH modification
2024-09-27 12:51:36 +01:00
James Dorfman
4b69418986
Merge aaeb315ff0 into merged_master (Bitcoin PR bitcoin/bitcoin#25357 )
2024-09-16 05:49:46 +00:00
James Dorfman
7d93a61eb3
Merge 5174a139c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25313 )
2024-09-10 01:00:42 +00:00
fanquake
5ed1511e50
guix: bump time-machine to 53396a22afc04536ddf75d8f82ad2eafa5082725
...
Includes:
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=9aa38f98cbd41644abe2c43bb4f44f74df642df2 .
2024-08-28 11:18:11 +01:00
Hennadii Stepanov
e821f0a37a
cmake: Migrate Guix build scripts to CMake
2024-08-16 21:19:11 +01:00
James Dorfman
7ae6a9bb4b
Merge e3bab43329 into merged_master (Bitcoin PR bitcoin/bitcoin#25099 )
2024-08-09 21:19:06 +00:00
James Dorfman
b6df20eb34
Merge d4475ea7ae into merged_master (Bitcoin PR bitcoin/bitcoin#22235 )
2024-08-09 04:52:58 +00:00
fanquake
eca20bead2
guix: bump time-machine to 7bf1d7aeaffba15c4f680f93ae88fbef25427252
...
Includes:
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=d428237642e1e4ac8fda4597205ffec89926c0ec .
which removes the need to build Python2, and OpenSSL 1.x when building
for Windows.
2024-08-08 10:44:43 +01:00
James Dorfman
0021cb6a2b
Merge bfbce6cbfe into merged_master (Bitcoin PR bitcoin/bitcoin#24031 )
2024-08-01 18:05:20 +00:00
merge-script
2401a24387
Merge bitcoin/bitcoin#30452 : guix: bump time-machine to efc26826400762207cde9f23802cfe75a737963c
...
6ee000e56fcbeb2c20e1https://github.com/bitcoin/bitcoin/issues/30210 . This doesn't switch runtimes, because upstream is
still configured to use the old runtime. See:
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=17188be0f723e00377b21b767f5447d7938a116e .
git-mimimal `2.45.1` -> `2.45.2`
Kernel Headers `6.1.92` -> `6.1.100`
LLVM `18.1.6` -> `18.1.8`
mingw-w64 `11.0.1` -> `12.0.0`
NSIS `3.09` -> `3.10`
patch `2.7.6` -> `2.7.6-0.f144b35`
ACKs for top commit:
TheCharlatan:
ACK 6ee000e56f
2024-07-31 09:50:10 +01:00
fanquake
6ee000e56f
guix: bump time-machine to efc26826400762207cde9f23802cfe75a737963c
...
Needed for 30210. This doesn't switch runtimes, because upstream is
still configured to use the old runtime. See:
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=17188be0f723e00377b21b767f5447d7938a116e .
git-mimimal 2.45.1 -> 2.45.2
Kernel Headers 6.1.92 -> 6.1.100
LLVM 18.1.6 -> 18.1.8
mingw-w64 11.0.1 -> 12.0.0
NSIS 3.09 -> 3.10
patch 2.7.6 -> 2.7.6-0.f144b35
2024-07-26 09:31:16 +01:00
fanquake
1807760f09
guix: improve ENV unsetting for macOS
2024-07-25 14:18:22 +01:00
fanquake
e9a44faf14
depends: remove FORCE_USE_SYSTEM_CLANG
2024-06-10 13:15:23 +01:00
