Skip to content

追加: master/main 両ブランチに対応#1168

Draft
tarepan wants to merge 4 commits intoVOICEVOX:masterfrom
tarepan:refactor/switch_main
Draft

追加: master/main 両ブランチに対応#1168
tarepan wants to merge 4 commits intoVOICEVOX:masterfrom
tarepan:refactor/switch_main

Conversation

@tarepan
Copy link
Collaborator

@tarepan tarepan commented Apr 2, 2024

内容

概要: main ブランチ移行へ向けた master/main 両ブランチ対応を追加

現行の master ブランチから新しい main ブランチへ無エラー移行可能なように、master/main の両ブランチ名に対応した。
以下の実装によりこれを実現した:

  • Workflow における main trigger の追加
  • Workflow における push ブランチ名自動取得の追加
  • ライセンス取得先のフォールバック追加

関連 Issue

part of #1067

依存 issues

直接の依存 issues / PRs は無し。
ただし、PR 先の手動付け替えが必要と思われるため、open PR が減ってからの review が妥当。

Notes

本 PR merge 後、main にブランチ名を変更し、master 対応を削除して完了。

@github-actions
Copy link

github-actions bot commented Apr 2, 2024

Coverage Result

Resultを開く
Name Stmts Miss Cover
run.py 517 197 coverage-62%
voicevox_engine/init.py 1 0 coverage-100%
voicevox_engine/cancellable_engine.py 97 75 coverage-23%
voicevox_engine/core/init.py 0 0 coverage-100%
voicevox_engine/core/core_adapter.py 81 6 coverage-93%
voicevox_engine/core/core_initializer.py 60 30 coverage-50%
voicevox_engine/core/core_wrapper.py 228 160 coverage-30%
voicevox_engine/dev/init.py 0 0 coverage-100%
voicevox_engine/dev/core/init.py 0 0 coverage-100%
voicevox_engine/dev/core/mock.py 65 2 coverage-97%
voicevox_engine/dev/tts_engine/init.py 0 0 coverage-100%
voicevox_engine/dev/tts_engine/mock.py 28 0 coverage-100%
voicevox_engine/engine_manifest/EngineManifest.py 36 0 coverage-100%
voicevox_engine/engine_manifest/EngineManifestLoader.py 11 0 coverage-100%
voicevox_engine/engine_manifest/init.py 0 0 coverage-100%
voicevox_engine/library_manager.py 92 4 coverage-96%
voicevox_engine/metas/Metas.py 36 0 coverage-100%
voicevox_engine/metas/MetasStore.py 28 1 coverage-96%
voicevox_engine/metas/init.py 0 0 coverage-100%
voicevox_engine/model.py 180 3 coverage-98%
voicevox_engine/morphing.py 72 4 coverage-94%
voicevox_engine/preset/Preset.py 13 0 coverage-100%
voicevox_engine/preset/PresetError.py 2 0 coverage-100%
voicevox_engine/preset/PresetManager.py 82 2 coverage-98%
voicevox_engine/preset/init.py 0 0 coverage-100%
voicevox_engine/setting/Setting.py 9 0 coverage-100%
voicevox_engine/setting/SettingLoader.py 20 0 coverage-100%
voicevox_engine/setting/init.py 0 0 coverage-100%
voicevox_engine/tts_pipeline/init.py 0 0 coverage-100%
voicevox_engine/tts_pipeline/kana_converter.py 88 1 coverage-99%
voicevox_engine/tts_pipeline/mora_mapping.py 7 0 coverage-100%
voicevox_engine/tts_pipeline/phoneme.py 34 0 coverage-100%
voicevox_engine/tts_pipeline/text_analyzer.py 146 6 coverage-96%
voicevox_engine/tts_pipeline/tts_engine.py 268 9 coverage-97%
voicevox_engine/user_dict/part_of_speech_data.py 5 0 coverage-100%
voicevox_engine/user_dict/user_dict.py 146 12 coverage-92%
voicevox_engine/utility/init.py 0 0 coverage-100%
voicevox_engine/utility/connect_base64_waves.py 37 0 coverage-100%
voicevox_engine/utility/core_utility.py 6 0 coverage-100%
voicevox_engine/utility/core_version_utility.py 8 1 coverage-88%
voicevox_engine/utility/mutex_utility.py 13 0 coverage-100%
voicevox_engine/utility/path_utility.py 26 6 coverage-77%
voicevox_engine/utility/run_utility.py 10 7 coverage-30%
TOTAL 2452 526 coverage-79%

@tarepan tarepan force-pushed the refactor/switch_main branch from c680b67 to f2af1a1 Compare April 7, 2024 13:02
@tarepan tarepan force-pushed the refactor/switch_main branch from f2af1a1 to b5e0539 Compare April 9, 2024 14:12
@Hiroshiba Hiroshiba force-pushed the master branch 3 times, most recently from e2f0df9 to 5a6877e Compare June 9, 2025 12: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.

1 participant