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

[project-vvm-async-api] mainをマージする #516

Merged

Conversation

qryxip
Copy link
Member

@qryxip qryxip commented Jun 10, 2023

内容

コンフリクト解消のため、mainをマージします。

mainに入れるべき大きな変更というのもしばらくは無さそうなので、このタイミングがちょうどいいかなと思いました。

関連 Issue

#497

その他

drop(CString::from_raw(ptr));
}

#[allow(dead_code)] // FIXME: これの代わりに、定数全部をコンストラクタに与える形にする
Copy link
Member Author

@qryxip qryxip Jun 10, 2023

Choose a reason for hiding this comment

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

mainの #500 と project-vvm-async-apiの #503 が噛み合わないため、マージコミット内でこの一行だけ追加。

このPRで対応というのも考えましたが、別PRの方がいいかなと。

@qryxip
Copy link
Member Author

qryxip commented Jun 10, 2023

なんかさっきからこれが、何故かWindowsでだけこけ続けてる…???

echo "EXPECTED_VOICEVOX_CORE_VERSION=$(curl -sSfI "https://github.com/VOICEVOX/voicevox_core/releases/latest"| grep "location:" | sed -e "s%location: https://github.com/VOICEVOX/voicevox_core/releases/tag/%%" | sed 's/\r//g')" >> "$GITHUB_ENV"

@Hiroshiba
Copy link
Member

試しに該当箇所のActions作ってみたけど問題なく動きました。

コード https://github.com/Hiroshiba/test_actions/blob/50bca2f3ec74ec934efb4a6530dc7f4a94f312ac/.github/workflows/test.yml
Actions https://github.com/Hiroshiba/test_actions/actions/runs/5231147139/jobs/9445110043

コードがどこか変わっておかしくなった(思い当たらないけど)か、Actionsのガチャ失敗という感じでしょうか・・・。
Actionsの run: | の直後に set -eux と書くと実行ログが出てくるので何かわかるかもです。(単純にガチャ引き直しもできるはず)
こんな感じに https://github.com/Hiroshiba/test_actions/blob/886dec9ba3a0e13d4aef25020578b3339eae33a4/.github/workflows/test.yml#L15-L17

@qryxip
Copy link
Member Author

qryxip commented Jun 10, 2023

多分ガチャの方ですね… さっきmainのをre-runしたら落ちたので。
https://github.com/VOICEVOX/voicevox_core/actions/runs/5179482508/jobs/9445000743

@Hiroshiba
Copy link
Member

Hiroshiba commented Jun 10, 2023

以前のと比較するとRunner ImageVersion: 20230606.1になってますね(以前のはVersion: 20230517.1

差分見ても理由はよくわからないですね・・・。Chocolateyのメジャーバージョンアップ・・・?

diff \
  <(curl https://raw.githubusercontent.com/actions/runner-images/win22/20230517.1/images/win/Windows2022-Readme.md) \
  <(curl https://raw.githubusercontent.com/actions/runner-images/win22/20230606.1/images/win/Windows2022-Readme.md)
diff
3c3,5
< | [python2.7 will be removed from the images on May 22, 2023](https://github.com/actions/runner-images/issues/7401) |
---
> | [[All OSs] .NET 3.1 will be removed from the images on July, 3](https://github.com/actions/runner-images/issues/7667) |
> | [Actions runner image scheduled maintenance (June 2 2023 through June 12 20223)](https://github.com/actions/runner-images/issues/7660) |
> | [python2.7 will be removed from the images on June 12, 2023](https://github.com/actions/runner-images/issues/7401) |
7c9
< - Image Version: 20230517.1
---
> - Image Version: 20230606.1
27,28c29,30
< - Chocolatey 1.4.0
< - Composer 2.5.5
---
> - Chocolatey 2.0.0
> - Composer 2.5.7
32c34
< - NuGet 6.5.0.154
---
> - NuGet 6.6.0.61
36c38
< - Vcpkg (build from commit 7b30311f0)
---
> - Vcpkg (build from commit 750591668)
49c51
< - sbt 1.8.3
---
> - sbt 1.9.0
54,55c56,57
< - azcopy 10.18.1
< - Bazel 6.2.0
---
> - azcopy 10.19.0
> - Bazel 6.2.1
59,61c61,63
< - CMake 3.26.3
< - CodeQL Action Bundles 2.13.0 2.13.1
< - Docker 24.0.0
---
> - CMake 3.26.4
> - CodeQL Action Bundles 2.13.1 2.13.3
> - Docker 24.0.2
65,66c67,68
< - ghc 9.6.1
< - Git 2.40.1.windows.1
---
> - ghc 9.6.2
> - Git 2.41.0.windows.1
68c70
< - ImageMagick 7.1.1-9
---
> - ImageMagick 7.1.1-11
72c74
< - Kubectl 1.27.1
---
> - Kubectl 1.27.2
77c79
< - OpenSSL 1.1.1t
---
> - OpenSSL 1.1.1u
79c81
< - Pulumi 3.67.1
---
> - Pulumi 3.69.0
82c84
< - Stack 2.9.3
---
> - Stack 2.11.1
88c90
< - yamllint 1.31.0
---
> - yamllint 1.32.0
92,94c94,96
< - Alibaba Cloud CLI 3.0.164
< - AWS CLI 2.11.20
< - AWS SAM CLI 1.84.0
---
> - Alibaba Cloud CLI 3.0.165
> - AWS CLI 2.11.25
> - AWS SAM CLI 1.86.0
96c98
< - Azure CLI 2.48.1
---
> - Azure CLI 2.49.0
98c100
< - GitHub CLI 2.29.0
---
> - GitHub CLI 2.30.0
102,104c104,106
< - Cargo 1.69.0
< - Rust 1.69.0
< - Rustdoc 1.69.0
---
> - Cargo 1.70.0
> - Rust 1.70.0
> - Rustdoc 1.70.0
111,112c113,114
< - cbindgen 0.24.3
< - Clippy 0.1.69
---
> - cbindgen 0.24.5
> - Clippy 0.1.70
116,120c118,122
< - Google Chrome 113.0.5672.127
< - Chrome Driver 113.0.5672.63
< - Microsoft Edge 113.0.1774.42
< - Microsoft Edge Driver 113.0.1774.42
< - Mozilla Firefox 113.0.1
---
> - Google Chrome 114.0.5735.110
> - Chrome Driver 114.0.5735.90
> - Microsoft Edge 114.0.1823.37
> - Microsoft Edge Driver 114.0.1823.37
> - Mozilla Firefox 114.0
217c219
< | Nginx  | 1.23.4  | C:\tools\nginx-1.23.4\conf\nginx.conf | nginx       | Stopped       | 80         |
---
> | Nginx  | 1.25.0  | C:\tools\nginx-1.25.0\conf\nginx.conf | nginx       | Stopped       | 80         |
222c224
< | Visual Studio Enterprise 2022 | 17.6.33712.159 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise |
---
> | Visual Studio Enterprise 2022 | 17.6.33723.286 | C:\Program Files\Microsoft Visual Studio\2022\Enterprise |
536c538
< - nbgv 3.6.132+bc56096f69
---
> - nbgv 3.6.133+2d32d93cb1
548c550
< - AWSPowershell: 4.1.334
---
> - AWSPowershell: 4.1.346
556c558
< - SqlServer: 22.0.59
---
> - SqlServer: 22.1.1
571c573
< | Android SDK Platform-Tools | 34.0.1                                                                                                                                                                                                       |
---
> | Android SDK Platform-Tools | 34.0.3                                                                                                                                                                                                       |

@Hiroshiba
Copy link
Member

とりあえず直すPR出しました。

* windows-latestでなぜかdownload_testが落ちるのを修正

* a
@qryxip
Copy link
Member Author

qryxip commented Jun 11, 2023

なるほど... #515 のsquash mergeコミット(dfbb533 (#497))が ✔️ だったのが順序的に腑に落ちなかったのですが、よく見たらコンフリクトしてるからpull_requestトリガーのが起動していなかっただけだった...

qryxip added 2 commits June 11, 2023 14:55
* `__declspec(dllimport)`と関数定義の隙間の空行を消す

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

* jobをリネーム

* 誤字
@qryxip qryxip force-pushed the project-vvm-async-merge-main branch from 1af55ec to 686567f Compare June 12, 2023 12:37
@qryxip
Copy link
Member Author

qryxip commented Jun 12, 2023

#517, #518, #519 を入れてforce pushしました。

@qryxip qryxip mentioned this pull request Jun 12, 2023
67 tasks
@qryxip qryxip marked this pull request as draft June 12, 2023 12:59
@qryxip qryxip force-pushed the project-vvm-async-merge-main branch from 686567f to 40f6662 Compare June 12, 2023 13:02
@qryxip qryxip marked this pull request as ready for review June 12, 2023 13:02
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 Hiroshiba merged commit 5f6ee44 into VOICEVOX:project-vvm-async-api Jun 12, 2023
@qryxip
Copy link
Member Author

qryxip commented Jun 12, 2023

あれ、squashしてません...?
image

@Hiroshiba
Copy link
Member

あ! テスト通ったらsquashせずにマージせねばと思ってテスト終わるの待ってたら忘れてsquashしてしまいました・・・。
全く同じPRを作って通常mergeできないかとか、なんならreset --hardして通常mergeできないかなどを検討します 🙇‍♂️

@qryxip
Copy link
Member Author

qryxip commented Jun 13, 2023

mergeされたPRってreopenできましたっけ…?
それとは別に履歴破壊をするかどうかですが、微妙なとこですね…

@Hiroshiba
Copy link
Member

reopenは昔やろうとした感じだとできない感じでした。
とりあえずresetなしで通常mergeが可能そうか確かめています。

@Hiroshiba
Copy link
Member

にてsquashなしで追加マージしました 🙇‍♂️

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