Cleanup update logic for embedded openssl git tree.#324
Merged
rbsec merged 2 commits intorbsec:masterfrom Jan 18, 2025
Merged
Conversation
Due to the shallow clone, the existing openssl tree never updates as the tag we are attempting to move to does not exist in our tree causing the "git checkout" command to fail the pipeline. Instead, if the latest blessed version of the upstream (as defined by the regex we used to decide which openssl version we support) is different than our local tree, use "git fetch" to grab the new tag and then use "git checkout" to move our local tree to it. Tested on: Way too many trees of openssl in different states
Owner
|
Good catch - thanks! |
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
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.
The pipeline to update the embedded openssl tree has a logic error and cannot checkout a tag that isn't in the local repository. This errors out causing the embedded tree to never be updated.
To reproduce checkout an older tree (3.0.14) and see how it doesn't properly update:
This change properly fetches the new tag and will then properly check it out. With the updated Makefile:
I'm maintaining the shallow clone behavior and doing the fetch with
--depth 1which makes it about as minimal as possible. Updating from 3.0.14 to 3.0.15 transferred 64KiB on the wire, according to git.