scripted-diff: gitian: Use REFERENCE_DATETIME directly. #16184
Merged
Conversation
This file contains hidden or 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
Fixes regression introduced by bitcoin#16141 -BEGIN VERIFY SCRIPT- sed -i 's#\$REFERENCE_DATE\\\\\\ \$REFERENCE_TIME#\$REFERENCE_DATETIME#g' contrib/gitian-descriptors/* -END VERIFY SCRIPT-
|
Can you explain how the regression was introduced? |
|
Concept ACK |
|
Concept ACK. Thanks. @MarcoFalke It was my poor copy-paste, followed by some over-the-shoulder review. Also a little related discussion in the edit: closing obviously accidental. |
|
Oh, let me rephrase: Why did |
@MarcoFalke |
|
Ah, so the issue could be fixed by escaping properly, but you decided to use |
Done. |
I don't think it was actually being used, it was in a variable and then copied and pasted into the sed by #16141 which broke the build, but should have been escaped |
@sidhujag It was being used pre-16141, see: https://www.gnu.org/software/tar/manual/html_node/using-tar-options.html |
|
|
Gitian builds for commit 8a503a6 (master): Gitian builds for commit c80f31d (master and this pull):
|
maflcko
pushed a commit
that referenced
this pull request
Jun 11, 2019
993aa41 scripted-diff: gitian: Use REFERENCE_DATETIME directly. (Carl Dong) Pull request description: Fixes regression introduced by #16141. ``` -BEGIN VERIFY SCRIPT- sed -i 's#\$REFERENCE_DATE\\\\\\ \$REFERENCE_TIME#\$REFERENCE_DATETIME#g' contrib/gitian-descriptors/* -END VERIFY SCRIPT- ``` ----- Note that this could have been fixed by escaping properly, but using `REFERENCE_DATETIME` directly is simpler. Future note: `REFERENCE_{DATE{,DATETIME},TIME}` is a bit ridiculous. At the very _least_ gitian should use epoch, as it is the most parse-able, and preferably set SOURCE_DATE_EPOCH. ACKs for commit 993aa4: Tree-SHA512: 8457e5fffde66e1d2b846547b6807416b884c171f63569f76dfefd498d2a58ad6f9eb93931eb6cfc7ff38c6b460b0c488ca87d1a68bc630c48f365a74b6ee163
|
Thanks! POsthumous utACK 993aa41 |
|
Grr, sorry for missing this in review. Post-merge ACK 993aa41. |
18 tasks
deadalnix
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Oct 27, 2020
…ptors Summary: bc8863b81922eb878519f328e9b0c7974aaa34ff depends: remove usage of TAR_OPTIONS (fanquake) 3ff1f2a319fc619954736d1e540ccbebc818ff11 build: remove export GZIP from gitian descriptors (fanquake) Pull request description: The `GZIP` environment variable is [deprecated](https://www.gnu.org/software/gzip/manual/gzip.html#Environment), and everywhere that we invoke `gzip` we are already passing `-9n` directly, i.e: ```base find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST ``` ```bash GZIP="-9n" gzip -h gzip: warning: GZIP environment variable is deprecated; use an alias or script Usage: gzip [OPTION]... [FILE]... ``` Merge #16184: scripted-diff: gitian: Use REFERENCE_DATETIME directly. Pull request description: Fixes regression introduced by #16141. ``` -BEGIN VERIFY SCRIPT- sed -i 's#\$REFERENCE_DATE\\\\\\ \$REFERENCE_TIME#\${REFERENCE_DATETIME}#g' contrib/gitian-descriptors/* -END VERIFY SCRIPT- ``` ----- Note that this could have been fixed by escaping properly, but using `REFERENCE_DATETIME` directly is simpler. Future note: `REFERENCE_{DATE{,DATETIME},TIME}` is a bit ridiculous. At the very _least_ gitian should use epoch, as it is the most parse-able, and preferably set SOURCE_DATE_EPOCH. Backport of Core [[bitcoin/bitcoin#16141 | PR16141]] and [[bitcoin/bitcoin#16184 | PR16184]] (to fix a regression in 16141) Test Plan: Run all Gitian builds in CI Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Subscribers: Fabien Differential Revision: https://reviews.bitcoinabc.org/D8136
random-zebra
added a commit
to random-zebra/PIVX
that referenced
this pull request
Jul 19, 2021
…scriptors a7dbb27 build: add missing attributes to Win installer (Fuzzbawls) 13d0b48 nsis: Don't duplicate URL string (Fuzzbawls) 56563e5 build: remove WINDOWS_BITS from build system (fanquake) 0cb37c8 nsis: Write to correct filename in first place (Carl Dong) 7aa2823 gitian: Put things in the right place to begin with (Carl Dong) 0dcf6e6 gitian: Eliminate rename dependency (Carl Dong) ba579b9 gitian: Smaller diff with gitian-linux.yml (Carl Dong) 3b9d5e8 gitian: Fix README inclusion in archives (Carl Dong) 07c27d2 gitian: Use split-debug.sh for Win builds (Carl Dong) 9f19095 build: Add README.md to DIST target (MarcoFalke) ce80c76 build: remove mingw linker workaround from win gitian descriptor (fanquake) 37441b0 scripted-diff: gitian: Use REFERENCE_DATETIME directly. (Fuzzbawls) 966fe9a depends: remove usage of TAR_OPTIONS (fanquake) 12fd641 build: remove export GZIP from gitian descriptors (fanquake) Pull request description: This is a collection of upstream PRs focused on cleaning up the gitian descriptors (un-needed or duplicate code bits, standardizing similar actions across the descriptors, etc), and minor cleanups to supporting build system files. Included are the following upstream PRs: * bitcoin#16141 * bitcoin#16184 * bitcoin#16667 * bitcoin#17097 * bitcoin#17029 * bitcoin#17308 * bitcoin#17756 * bitcoin#18059 ACKs for top commit: furszy: Tested ACK a7dbb27 random-zebra: ACK a7dbb27 and merging... Tree-SHA512: 409d4f51adfb1c90aa8bc572fe6610596dea1293a8ca795f9071bb88bd583bd7678359ee19e34440bb0d117075ebd27f9a622247ee3dfd0cd9088e6da306a4d5
UdjinM6
pushed a commit
to UdjinM6/dash
that referenced
this pull request
Oct 23, 2021
…rectly. 993aa41 scripted-diff: gitian: Use REFERENCE_DATETIME directly. (Carl Dong) Pull request description: Fixes regression introduced by bitcoin#16141. ``` -BEGIN VERIFY SCRIPT- sed -i 's#\$REFERENCE_DATE\\\\\\ \$REFERENCE_TIME#\$REFERENCE_DATETIME#g' contrib/gitian-descriptors/* -END VERIFY SCRIPT- ``` ----- Note that this could have been fixed by escaping properly, but using `REFERENCE_DATETIME` directly is simpler. Future note: `REFERENCE_{DATE{,DATETIME},TIME}` is a bit ridiculous. At the very _least_ gitian should use epoch, as it is the most parse-able, and preferably set SOURCE_DATE_EPOCH. ACKs for commit 993aa4: Tree-SHA512: 8457e5fffde66e1d2b846547b6807416b884c171f63569f76dfefd498d2a58ad6f9eb93931eb6cfc7ff38c6b460b0c488ca87d1a68bc630c48f365a74b6ee163
UdjinM6
pushed a commit
to UdjinM6/dash
that referenced
this pull request
Dec 4, 2021
…rectly. 993aa41 scripted-diff: gitian: Use REFERENCE_DATETIME directly. (Carl Dong) Pull request description: Fixes regression introduced by bitcoin#16141. ``` -BEGIN VERIFY SCRIPT- sed -i 's#\$REFERENCE_DATE\\\\\\ \$REFERENCE_TIME#\$REFERENCE_DATETIME#g' contrib/gitian-descriptors/* -END VERIFY SCRIPT- ``` ----- Note that this could have been fixed by escaping properly, but using `REFERENCE_DATETIME` directly is simpler. Future note: `REFERENCE_{DATE{,DATETIME},TIME}` is a bit ridiculous. At the very _least_ gitian should use epoch, as it is the most parse-able, and preferably set SOURCE_DATE_EPOCH. ACKs for commit 993aa4: Tree-SHA512: 8457e5fffde66e1d2b846547b6807416b884c171f63569f76dfefd498d2a58ad6f9eb93931eb6cfc7ff38c6b460b0c488ca87d1a68bc630c48f365a74b6ee163
UdjinM6
added a commit
to dashpay/dash
that referenced
this pull request
Dec 5, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes regression introduced by #16141.
Note that this could have been fixed by escaping properly, but using
REFERENCE_DATETIMEdirectly is simpler.Future note:
REFERENCE_{DATE{,DATETIME},TIME}is a bit ridiculous. At the very least gitian should use epoch, as it is the most parse-able, and preferably set SOURCE_DATE_EPOCH.