Skip to content

macos-latest = macos-14に適応する - #784

Merged
Hiroshiba merged 2 commits into
VOICEVOX:mainfrom
qryxip:adapt-to-macos-14
Apr 30, 2024
Merged

Hiroshiba merged 2 commits into
VOICEVOX:mainfrom
qryxip:adapt-to-macos-14

Conversation

@qryxip

@qryxip qryxip commented Apr 29, 2024

Copy link
Copy Markdown
Member

内容

macos-latestがmacos-14 (AArch64)になったためそれに対応します。

https://github.com/qryxip/voicevox_core/actions/runs/8869988493/job/24351267440

関連 Issue

その他

Comment on lines -280 to -286
# `macos-latest`(=`macos-12`)で次の問題が発生するため、それに対するワークアラウンド
# https://github.com/VOICEVOX/voicevox_core/issues/653#issuecomment-1782108410
- if: startsWith(matrix.os, 'mac')
name: Build open_jtalk-sys
run: |
poetry run -- cargo build -p voicevox_core_python_api -vv || true
[ -n "$(find ../../target/debug/deps -name 'libopen_jtalk_sys-*.rlib')" ]

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

今これを抜いて実行してみても通ったので、多分もう不要。

Comment thread .github/workflows/test.yml Outdated
Comment on lines +315 to +308
uses: actions/setup-java@v2
uses: actions/setup-java@v3

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

よくわからないが、v2だとx86_64のJavaを持ってきてしまう。
(ちなみに現在の最新はv4)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

特に問題が無ければv4に上げても良さそうな気がします。

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

まあ確かにここはv4でもいいかなとは思いました。
(他のは別PRで一斉に引き上げるとして)

82900e8 (#784)

@qryxip

qryxip commented Apr 30, 2024

Copy link
Copy Markdown
Member Author

@Hiroshiba 文脈を補足すると、mainブランチのCIが壊れており(rerunすると落ちる)それに対する修正です。

@Hiroshiba Hiroshiba left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM!!

@Hiroshiba
Hiroshiba merged commit 3d6a63b into VOICEVOX:main Apr 30, 2024
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.

3 participants