backport: merge bitcoin#23909, #23778, #24495,#25313, #24042, #24057, #24348, #24484, #24489, #24599, #24503, #24506, #24573, #25779, #24736, #24842, #25006, #25076, #25490, #25558 (guix backports: part 2) #5408
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced May 31, 2023
kwvg
force-pushed
the
guix_p2
branch
2 times, most recently
from
01b8316
to
36b3f7f
Compare
|
This pull request has conflicts, please rebase. |
kwvg
force-pushed
the
guix_p2
branch
2 times, most recently
from
028abc7
to
62d80b2
Compare
|
This pull request has conflicts, please rebase. |
kwvg
force-pushed
the
guix_p2
branch
2 times, most recently
from
2bc1dc7
to
306411e
Compare
kwvg
changed the title
Build outputBinaries: Archives: |
PastaPastaPasta
previously approved these changes
Jun 11, 2023
knst
requested changes
Jun 12, 2023
contrib/guix/guix-build
Outdated
| @@ -239,7 +239,7 @@ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}" | |||
| time-machine() { | |||
| # shellcheck disable=SC2086 | |||
| guix time-machine --url=https://git.savannah.gnu.org/git/guix.git \ | |||
| --commit=6ba510d76d6847065be725e958718002f3b13c7a \ | |||
| --commit=1ef7a03a148cf5f83ab1820444f6bd50d8e732d1 \ | |||
There was a problem hiding this comment.
just a note for re-review:
extra changes in contrib/guix/manifest.scm already presented:
+ (substitute* "tests/test_validate.py"
+ (("^(.*)def test_revocation_mode_soft" line indent)
+ (string-append indent
+ "@unittest.skip(\"Disabled by Guix\")\n"
+ line)))
In bitcoin they are removed in Merge bitcoin#24503: guix: use the latest version of signapple
but re-added in Merge bitcoin#25779: guix: ignore additional failing certvalidator test
So, backport is NOT partial, we already have both these backports merged.
UdjinM6
reviewed
Jun 12, 2023
There was a problem hiding this comment.
Hashes match and gitian still works.
side note: let's use checksum scripts which would let us all have the same output (and which would match guix github workflow results too) i.e.:
# for binaries
( \
SRC_PATH_PREFIX=guix-build-$(git rev-parse --short=12 HEAD)/distsrc- && \
sha256sum ${SRC_PATH_PREFIX}*/src/dash{d,-cli,-tx,-wallet}{,.exe} && \
sha256sum ${SRC_PATH_PREFIX}*/src/qt/dash-qt{,.exe} && \
sha256sum ${SRC_PATH_PREFIX}*/src/test/test_dash{,.exe} \
) | LC_ALL=C sort -k 2
# for archives
find guix-build-"$(git rev-parse --short=12 HEAD)"/output -type f | grep -v SHA256 | xargs sha256sum | LC_ALL=C sort -k 2
|
Added two commits instead of integrating them into backport PR and haven't rebased upon |
knst
approved these changes
Jun 12, 2023
UdjinM6
approved these changes
Jun 12, 2023
PastaPastaPasta
approved these changes
Jun 18, 2023
…0 as minimum supported
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Additional Information