Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add: x86_64-linux-androidを追加 #473

Merged
merged 7 commits into from
Apr 26, 2023

Conversation

sevenc-nanashi
Copy link
Member

内容

タイトル通り。

関連 Issue

その他

Copy link
Member

@qryxip qryxip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aarch64と同様にbuild and deploy workflowに加えないとビルドできないと思います。

@sevenc-nanashi sevenc-nanashi requested a review from qryxip April 24, 2023 14:23
@sevenc-nanashi
Copy link
Member Author

おっと。追加しました

Copy link
Member

@qryxip qryxip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Comment on lines 140 to 141
UNDERSCORED_TRIPLE=$(sed 's/-/_/g' <<< "${{ matrix.target }}")
echo "AR_$UNDERSCORED_TRIPLE=llvm-ar" >> "$GITHUB_ENV"
Copy link
Member

@Hiroshiba Hiroshiba Apr 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actionlintがエラーを吐いてますねぇ。
$(sed 's/-/_/g' <<< "${{ matrix.target }}")という記法が怒られてそうです。
(たしかに見慣れない記法だなとは思いました)

actionlintでshellcheckを省けそうでした。
https://github.com/rhysd/actionlint/blob/94c4f0119fdc7f776c7a472a981121cafd17a3cd/docs/usage.md?plain=1#L36-L42

actionlintはこちらにあります。

bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
./actionlint -color

@qryxip actionlint、開発者側でlintする方法が示されていないので、どうしようか迷っています。
あったほうが絶対いいのですが、どうしようかなーと。
通らなくてもエラーにしないようにする(warnにする)か、READMEで案内するかとか・・・?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actionlintはエディタに統合するのが面倒ですし、確かにCIで落ちて気付くというのが大半になりそうです。

思ったのですが、#466 (comment)で言ってたreviewdogをactionlintに使うというのはどうでしょうか? reviewdog/action-actionlintというのがありますし、これをそのまま使えばよさそう。

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reviewdogを使うの良いと思います!
あとついでにwarnにしてあげれば良いかも。

Copy link
Member

@Hiroshiba Hiroshiba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1点以外はLGTMでした!

@sevenc-nanashi
Copy link
Member Author

CI通りましたー。

Copy link
Member

@qryxip qryxip left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

shell: bash
run: |
echo "$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin" >> "$GITHUB_PATH"
echo "AR_aarch64_linux_android=llvm-ar" >> "$GITHUB_ENV"
TRIPLE="${{ matrix.target }}"
echo "AR_${TRIPLE//-/-}=llvm-ar" >> "$GITHUB_ENV"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

眺めていてこの部分が気になった(多分誤植?)のですが、CI が通っているのでちょっと不思議に思っています……(私の勘違いで、元の方が正しいということでしたらすみません)

Suggested change
echo "AR_${TRIPLE//-/-}=llvm-ar" >> "$GITHUB_ENV"
echo "AR_${TRIPLE//-/_}=llvm-ar" >> "$GITHUB_ENV"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

あ、本当だ... なんで通るんでしょうか?

Copy link
Member Author

@sevenc-nanashi sevenc-nanashi Apr 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

x86_64-android-29(略)でいい感じになってる説?

…もしかしてこのActionなくても動く?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ログを見る限り、AR-x64_86_linux(略)AR-x64_86-linux(略)を両方チェックしてそうです。のでsedいらないと思います

Copy link
Member

@Hiroshiba Hiroshiba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!!

@Hiroshiba
Copy link
Member

マージします!

@sevenc-nanashi このアーキテクチャの製品版coreはビルドしたほうが良いでしょうか 👀

@Hiroshiba Hiroshiba merged commit dc67cd1 into VOICEVOX:main Apr 26, 2023
@sevenc-nanashi
Copy link
Member Author

あー、お願いしますー。

@Hiroshiba
Copy link
Member

Hiroshiba commented Apr 29, 2023

@sevenc-nanashi ビルド完了したのでアップロードしました!!

https://github.com/VOICEVOX/voicevox_core/releases/tag/0.15.0-preview.2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants