Skip to content

[project-vvm-async-api] mainをsquashせずにマージする#520

Merged
Hiroshiba merged 11 commits into
project-vvm-async-apifrom
project-vvm-async-merge-main
Jun 13, 2023
Merged

[project-vvm-async-api] mainをsquashせずにマージする#520
Hiroshiba merged 11 commits into
project-vvm-async-apifrom
project-vvm-async-merge-main

Conversation

@Hiroshiba

Copy link
Copy Markdown
Member

@qryxip さんのPRを間違えてsquashマージしてしまったので、通常mergeをする用のPRです。
とくにreset --hardなどをせず、追加でmergeする感じで大丈夫なはず。

sh1ma and others added 11 commits May 23, 2023 23:27
Docs: 事例紹介のvoicevoxcore.goを追加
Co-authored-by: PickledChair <PickledChair@users.noreply.github.com>
Co-authored-by: Ryo Yamashita <qryxip@gmail.com>
* Python APIでは`panic=unwind`にする

* C APIは`-C panic=abort`でビルドする
* windows-latestでなぜかdownload_testが落ちるのを修正

* a
* `__declspec(dllimport)`と関数定義の隙間の空行を消す

* `fn.args="vertical"`を設定
* cbindgenの`include_version`を有効化する

* jobをリネーム

* 誤字
@Hiroshiba

Copy link
Copy Markdown
Member Author

テストはたぶん通るので忘れないうちにマージしちゃいます!

@Hiroshiba Hiroshiba merged commit 2fe08c4 into project-vvm-async-api Jun 13, 2023

@qryxip qryxip 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。

git switch -d
HEAD is now at 5f6ee44 [project-vvm-async-api] mainをマージする (#516)git merge 40f6662b61a27bf35ab2c20dc2973e22fb9722ab
Merge made by the 'ort' strategy.git diff 40f6662b61a27bf35ab2c20dc2973e22fb9722ab && echo "$?"
0

@qryxip qryxip mentioned this pull request Jun 13, 2023
67 tasks
@Hiroshiba Hiroshiba deleted the project-vvm-async-merge-main branch July 23, 2023 11:17
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