Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Snap] Fix nightly build's genbuild.sh patch #2546

Merged
merged 1 commit into from
Sep 10, 2021

Conversation

Fuzzbawls
Copy link
Collaborator

#2525 introduced changes to the genbuild.sh script, which gets patched
during the nightly snap builds. This follows up #2525 to create a new,
compatible patch.

PIVX-Project#2525 introduced changes to the genbuild.sh script, which gets patched
during the nightly snap builds. This follows up PIVX-Project#2525 to create a new,
compatible patch.
@Fuzzbawls Fuzzbawls added this to the 5.4.0 milestone Sep 10, 2021
@Fuzzbawls Fuzzbawls self-assigned this Sep 10, 2021
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 0f88891

Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK 0f88891

@furszy furszy merged commit 5eab91e into PIVX-Project:master Sep 10, 2021
@furszy furszy modified the milestones: 5.4.0, 5.3.1 Sep 17, 2021
furszy referenced this pull request in furszy/bitcoin-core Sep 17, 2021
bitcoin#2525 introduced changes to the genbuild.sh script, which gets patched
during the nightly snap builds. This follows up bitcoin#2525 to create a new,
compatible patch.

Github-Pull: bitcoin#2546
Rebased-From: 0f88891
furszy referenced this pull request in furszy/bitcoin-core Sep 19, 2021
bitcoin#2525 introduced changes to the genbuild.sh script, which gets patched
during the nightly snap builds. This follows up bitcoin#2525 to create a new,
compatible patch.

Github-Pull: bitcoin#2546
Rebased-From: 0f88891
Fuzzbawls added a commit that referenced this pull request Sep 21, 2021
2981a17 GUI: Remove unused, and invalid, cached QR pixmap pointer. (furszy)
798c3e9 GUI: addresses widget files overall code cleanup. (furszy)
51f6555 GUI: fix contacts list not being shown. (furszy)
5be181a [Consensus] Add checkpoints before v5.3.1 release Github-Pull: #2562 Rebased-From: e8fddd7 (random-zebra)
17fa0eb Masternode-sync: Only mark tier two messages sync requests as fulfilled if the messages are broadcast. e.g: do not mark them as fulfilled before fail for a timeout. (furszy)
2f98acf [BUG][GUI] Fix random double/triple transaction record issue (random-zebra)
754177e [BUG][TierTwo] Clear fulfilled requests when mnsync fails (random-zebra)
5a2e0d1 [Trivial] Update labelSubtitleAddress text in send widget ui Github-Pull: #2557 Rebased-From: efddb3b (random-zebra)
09b8ec0 [BUG] Spork signer doesn't persist new spork value to DB Github-Pull: #2553 Rebased-From: 5849e3e (random-zebra)
7f827e9 [Snap] Fix nightly build's genbuild.sh patch (Fuzzbawls)
24a1407 [Gitian] Ignore changes to relic_conf.h.in (Fuzzbawls)
b400640 Update manpages to reflect newer template (Fuzzbawls)
ecdbf86 [Docs] Reformat -help output for help2man (Fuzzbawls)
656be59 Run make translate to update source files (Fuzzbawls)
cd8d0b5 Stop translating command line options (Fuzzbawls)
004efe9 Stop translating remaining usages of PACKAGE_NAME (Fuzzbawls)
67e7938 Unify product name to as few places as possible (Fuzzbawls)
4fe9030 [RPC][Doc] Fix RPC/cli example in setautocombinethreshold help (random-zebra)
5f9aac4 Refactor: remove duplicated coll. confirmation check in MNModel::data Github-Pull: #2530 Rebased-From: f0fd8ac (random-zebra)
2a947c0 build: Get rid of `CLIENT_DATE` (Wladimir J. van der Laan)
51fca36 [Qt] Debug window: remove "Build date". (furszy)
d223d90 build: Remove src/obj directory from repository (Wladimir J. van der Laan)

Pull request description:

  PRs List:

  * #2525.
  * #2530.
  * #2540.
  * #2491.
  * #2541.
  * #2546.
  * #2553.
  * #2557.
  * #2559.

  Open PRs that have to get merged to be added here:

  * * [x] #2560.
  * * [x] #2555.
  * * [x] #2551.
  * * [x] #2562.

ACKs for top commit:
  random-zebra:
    ACK 2981a17
  Fuzzbawls:
    ACK 2981a17

Tree-SHA512: 400c6cd5c05c99b79c67cb0158048315f33d18a49c9606ad668727b6534c84bbbc8617eb7759b9b6fb230f8fb8b94e74902d03e1579b23b3e84d063ec7a142fa
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants