ci: Better error message on missing builder key #544
Merged
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
Also, add ascii check for all files.
maflcko
commented
Dec 21, 2022
| @@ -7,7 +7,14 @@ fn check_attestations(atts: Vec<&str>, mut keys: HashSet<&str>) -> Result<(), St | |||
| let builder_key = format!("builder-keys/{builder}.gpg"); | |||
| keys.remove(&builder_key as &str); | |||
| let builder_key_file = std::fs::File::open(&builder_key) | |||
| .map_err(|e| format!("Builder key not found for attestation. Attestation: '{att}', Key: '{builder_key}', Error: '{e}'"))?; | |||
| .map_err(|e| format!("Builder key not found for attestation. Attestation: '{att}', Key: '{builder_key}', Error: '{e}'.\nHelp: Run 'gpg --export --armor {builder} > {builder_key} && git add {builder_key}'"))?; | |||
There was a problem hiding this comment.
Looks like the \n remains escaped in the CI log. Maybe a good first issue if someone wants to fix this in a follow-up?
maflcko
commented
Dec 21, 2022
| for file in [&builder_key, att, &format!("{att}.asc")] { | ||
| let content = std::fs::read_to_string(file).unwrap(); | ||
| if !content.chars().all(|c| c.is_ascii()) { | ||
| return Err(format!("All files must be in ascii format. Make sure to pass --armor to gpg. File: {file}")); |
There was a problem hiding this comment.
For cross-reference doc, the --armor is set for the asc sig file in:
And required by cat to produce a text file in https://github.com/bitcoin/bitcoin/blame/dd7d82bec03c890b06e189950115bbb0c607f30f/doc/release-process.md#L214
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.
Print the command that people can copy-paste to add their builder key, if it was declared missing by CI