fix: extract openssl-sys root line before vendored check in diagnose step - #169
Merged
Merged
Conversation
…step cargo tree's output may include download progress messages (e.g. 'Downloading crates ...') at the beginning. Using head -1 directly on this output causes a false negative when checking for the vendored feature. Extract the openssl-sys root line first using grep '^openssl-sys ' to ensure we're checking the actual dependency line. Fixes run 32564299897 where vendored was present but wrongly reported as missing. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
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
1 participant
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.
説明
「Diagnose openssl-sys dependency path」ステップのバグを修正しました。
cargo treeの出力にダウンロード進捗メッセージが混入する場合、head -1がメッセージを拾ってしまい、実際には vendored 機能が有効なのに「vendored が無い」という誤ったエラーでビルドが停止していました。修正内容：
cargo treeの出力からopenssl-sysで始まる実際のルート行を先に抽出してから vendored 判定を実行修正対象
.github/workflows/external-build-android-aarch64.yml852行目echo "$OUT" | head -1 | grep -q 'vendored' || {echo "$OUT" | grep '^openssl-sys ' | head -1 | grep -q 'vendored' || {