GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38189 commits 49 branches 359 tags 252 MiB
Commit graph

430 commits

Author SHA1 Message Date
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
fanquake
e2ab9f83f8
build: disable external signer on Windows 2022-01-15 10:02:04 +08:00
MarcoFalke
95833c012e
Merge bitcoin/bitcoin#23938: ci: Clone entire bitcoin-core/qa-assets repo only when run fuzzing 
0b7c55f157 ci: Clone entire bitcoin-core/qa-assets repo only when run fuzzing (Hennadii Stepanov)

Pull request description:

  This PR speeds up CI tasks that run unit tests but do not run fuzzing.

  On my machine:
  ```
  $ time git clone --depth=1 https://github.com/bitcoin-core/qa-assets
  Cloning into 'qa-assets'...
  remote: Enumerating objects: 289750, done.
  remote: Counting objects: 100% (289750/289750), done.
  remote: Compressing objects: 100% (207687/207687), done.
  remote: Total 289750 (delta 16863), reused 275449 (delta 12092), pack-reused 0
  Receiving objects: 100% (289750/289750), 1.39 GiB | 4.79 MiB/s, done.
  Resolving deltas: 100% (16863/16863), done.
  Updating files: 100% (294515/294515), done.

  real7m43,417s
  user2m39,771s
  sys0m43,272s
  ```

ACKs for top commit:
  MarcoFalke:
    cr ACK 0b7c55f157

Tree-SHA512: 8f8dd63e361c3d9c64a2b31f207f59beea7d2e4142363f7762ec724a61152323fda0c6b98a36386e15f2ca4ef3f7412da763baef65e862fc7f48cdeda8c40e09
 2022-01-06 17:15:17 +01:00
Hennadii Stepanov
0b7c55f157
ci: Clone entire bitcoin-core/qa-assets repo only when run fuzzing 2022-01-06 16:23:48 +02:00
fanquake
e09773d20a
build: use a static .tiff for macOS .dmg over generating 
Co-authored-by: Pavol Rusnak <pavol@rusnak.io>
 2022-01-02 15:38:19 +08:00
MarcoFalke
623745ca74
Merge bitcoin/bitcoin#23912: Insert and bump copyright headers 
1362d6173f scripted-diff: Insert missed copyright headers (Hennadii Stepanov)
f47dda2c58 scripted-diff: Bump copyright headers (Hennadii Stepanov)
c29105efdc script: Fix copyright_header.py (Hennadii Stepanov)

Pull request description:

  This PR is an alternative to #23903.

  It bumps the existing copyright headers as we did every year, and adds the missed copyright headers.

  A small fix has been applied to the `copyright_header.py` in order to prevent such weird bumping as `2021` --> `2021-2017`.

ACKs for top commit:
  MarcoFalke:
    ACK 1362d6173f

Tree-SHA512: 204d970fe8c51546b26b8f03fe4297db8a9bef5101df851540b7b9eddbd3a09677ee81fdd882c60937d732407f42c9883165bd978272200cff8f90190f075905
 2021-12-31 12:08:49 +01:00
Hennadii Stepanov
f47dda2c58
scripted-diff: Bump copyright headers 
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-

Commits of previous years:
* 2020: fa0074e2d8
* 2019: aaaaad6ac9
 2021-12-30 19:36:57 +02:00
Hennadii Stepanov
ec7b7d4a36
ci: Enable the gui in the TSan build 2021-12-30 10:53:19 +02:00
fanquake
2da97b271b
ci: use GCC 8 when building packages in native_qt5 CI 
Our minimum required GCC is GCC 8, and this change in required for
changes like #23839 which take advantage of flags introduced in that
version of GCC.

This should have been included as part of
182de7ba10.
 2021-12-23 10:53:02 +08:00
MarcoFalke
fa6a548f54
ci: Disable s390x gui tests for now 2021-12-17 17:09:51 +01:00
fanquake
1b76b18f8a
Merge bitcoin/bitcoin#23585: scripted-diff: Drop Darwin version for better maintainability 
2f356a0ca8 scripted-diff: Drop Darwin version for better maintainability (Hennadii Stepanov)

Pull request description:

  After this PR, any macOS tools version bumping in the future will touch fewer files in the repo.

  Pointing a Darwin version for the `--host` system does not matter for the following reasons:

  - in terms of the resulted binaries, we should only care about the minimum supported macOS version which is a separated parameter in our build system.

  - in terms of the build system itself, the usage of the `$(host)` variable is self-consistent enough. Btw `$(host_os)` value already has the version dropped:
  ```
  $ make -C depends --no-print-directory print-host_os HOST=x86_64-apple-darwin19
  host_os=darwin
  ```

ACKs for top commit:
  gruve-p:
    ACK https://github.com/bitcoin/bitcoin/pull/23585/commits/2f356a0ca8b080c860c8924d201b98f1f9fa0ad5
  promag:
    ACK 2f356a0ca8.
  fanquake:
    ACK 2f356a0ca8

Tree-SHA512: 374896ab0ba02b0d8b4b21431fe963bd213b0d09586e0898c13a4c5fa294c1b693f1b2c92880c245c4157c14217b4825b36522f461930477f4d2a727086ebb2a
 2021-12-09 16:13:33 +08:00
Hennadii Stepanov
78a6bc6919
build, qt: Use Android NDK r23 LTS 2021-12-05 03:00:02 +02:00
Hennadii Stepanov
5202bd1dc0
test: Bump shellcheck version to 0.8.0 2021-11-30 21:15:40 +02:00