feat: 差分アップデートを追加 #2701
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,8 +20,8 @@ on: | |
| description: "コード署名する" | ||
| type: boolean | ||
| default: false | ||
| upload_all_artifacts: | ||
| description: "デバッグ用にすべての成果物をartifactにアップロードするか" | ||
sevenc-nanashi marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| type: boolean | ||
| default: false | ||
|
|
||
|
|
@@ -53,7 +53,7 @@ jobs: | |
| - artifact_name: linux-nvidia-prepackage | ||
| artifact_path: dist_electron/linux-unpacked | ||
| voicevox_engine_asset_name: linux-nvidia | ||
| package_name: voicevox-test | ||
|
|
||
| compressed_artifact_name: voicevox-linux-nvidia | ||
| app_asar_dir: prepackage/resources | ||
| installer_artifact_name: linux-nvidia-appimage | ||
|
|
@@ -65,7 +65,7 @@ jobs: | |
| - artifact_name: linux-cpu-x64-prepackage | ||
| artifact_path: dist_electron/linux-unpacked | ||
| voicevox_engine_asset_name: linux-cpu-x64 | ||
| package_name: voicevox-test-cpu | ||
| compressed_artifact_name: voicevox-linux-cpu-x64 | ||
| app_asar_dir: prepackage/resources | ||
| installer_artifact_name: linux-cpu-x64-appimage | ||
|
|
@@ -77,7 +77,7 @@ jobs: | |
| - artifact_name: linux-cpu-arm64-prepackage | ||
| artifact_path: dist_electron/linux-arm64-unpacked | ||
| voicevox_engine_asset_name: linux-cpu-arm64 | ||
| package_name: voicevox-test-cpu | ||
| compressed_artifact_name: voicevox-linux-cpu-arm64 | ||
| app_asar_dir: prepackage/resources | ||
| installer_artifact_name: linux-cpu-arm64-appimage | ||
|
|
@@ -89,7 +89,7 @@ jobs: | |
| - artifact_name: windows-nvidia-prepackage | ||
| artifact_path: dist_electron/win-unpacked | ||
| voicevox_engine_asset_name: windows-nvidia | ||
| package_name: voicevox-test-cuda | ||
| compressed_artifact_name: voicevox-windows-nvidia | ||
| app_asar_dir: prepackage/resources | ||
| installer_artifact_name: windows-nvidia-nsis-web | ||
|
|
@@ -99,7 +99,7 @@ jobs: | |
| - artifact_name: windows-cpu-prepackage | ||
| artifact_path: dist_electron/win-unpacked | ||
| voicevox_engine_asset_name: windows-cpu | ||
| package_name: voicevox-test-cpu | ||
| compressed_artifact_name: voicevox-windows-cpu | ||
| app_asar_dir: prepackage/resources | ||
| installer_artifact_name: windows-cpu-nsis-web | ||
|
|
@@ -109,7 +109,7 @@ jobs: | |
| - artifact_name: windows-directml-prepackage | ||
| artifact_path: dist_electron/win-unpacked | ||
| voicevox_engine_asset_name: windows-directml | ||
| package_name: voicevox-test | ||
| compressed_artifact_name: voicevox-windows-directml | ||
| app_asar_dir: prepackage/resources | ||
| installer_artifact_name: windows-directml-nsis-web | ||
|
|
@@ -119,7 +119,7 @@ jobs: | |
| - artifact_name: macos-cpu-x64-prepackage | ||
| artifact_path: dist_electron/mac | ||
| voicevox_engine_asset_name: macos-x64 | ||
| package_name: voicevox-test-cpu | ||
| compressed_artifact_name: voicevox-macos-cpu-x64 | ||
| app_asar_dir: prepackage/VOICEVOX.app/Contents/Resources | ||
| installer_artifact_name: macos-cpu-x64-dmg | ||
|
|
@@ -129,7 +129,7 @@ jobs: | |
| - artifact_name: macos-cpu-arm64-prepackage | ||
| artifact_path: dist_electron/mac-arm64 | ||
| voicevox_engine_asset_name: macos-arm64 | ||
| package_name: voicevox-test-cpu | ||
| compressed_artifact_name: voicevox-macos-cpu-arm64 | ||
| app_asar_dir: prepackage/VOICEVOX.app/Contents/Resources | ||
| installer_artifact_name: macos-cpu-arm64-dmg | ||
|
|
@@ -157,7 +157,7 @@ jobs: | |
| # so different package/product names should be used for CPU/DirectML/GPU builds. | ||
| - name: Replace package name & version | ||
| run: | | ||
| $sed -i 's/"name": "voicevox-test"/"name": "${{ matrix.package_name }}"/' package.json | ||
| # $sed -i 's/productName: "VOICEVOX"/productName: "${{ matrix.product_name }}"/' vue.config.js | ||
|
|
||
| $sed -i 's/"version": "999.999.999"/"version": "${{ env.VOICEVOX_EDITOR_VERSION }}"/' package.json | ||
|
|
@@ -255,6 +255,7 @@ jobs: | |
| LINUX_ARTIFACT_NAME: ${{ matrix.linux_artifact_name }} | ||
| LINUX_EXECUTABLE_NAME: ${{ matrix.linux_executable_name }} | ||
| MACOS_ARTIFACT_NAME: ${{ matrix.macos_artifact_name }} | ||
| INSTALLER_ARTIFACT_NAME: ${{ matrix.installer_artifact_name }} | ||
|
|
||
| # https://github.com/electron-userland/electron-builder/issues/3179 | ||
| USE_HARD_LINKS: false | ||
|
|
@@ -342,7 +343,7 @@ jobs: | |
| rm $name.tar | ||
|
|
||
| - name: Upload Linux tar.gz (without nvidia) to Artifacts | ||
| if: startsWith(matrix.artifact_name, 'linux-') && !contains(matrix.artifact_name, 'nvidia') && github.event.inputs.upload_all_artifacts == 'true' | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: ${{ matrix.artifact_name }}-targz | ||
|
|
@@ -372,7 +373,7 @@ jobs: | |
| 7z rn $name.zip prepackage/ VOICEVOX/ | ||
|
|
||
| - name: Upload Windows & Mac zip (without nvidia) to Artifacts | ||
| if: (startsWith(matrix.artifact_name, 'windows-') || startsWith(matrix.artifact_name, 'macos-')) && !contains(matrix.artifact_name, 'nvidia') && github.event.inputs.upload_all_artifacts == 'true' | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: ${{ matrix.artifact_name }}-zip | ||
|
|
@@ -412,20 +413,32 @@ jobs: | |
| THUMBPRINT_PATH: /tmp/esignercka_thumbprint.txt | ||
| SIGNTOOL_PATH_PATH: /tmp/signtool_path.txt | ||
|
|
||
| - name: Create app-update.yml | ||
| run: | | ||
| # prepackageを使うとapp-update.ymlが生成されないので、手動で作成する | ||
| cat <<YAML > ${{ matrix.app_asar_dir }}/app-update.yml | ||
| provider: generic | ||
| url: https://vv-update-api.sevenc7c.workers.dev/${{ matrix.installer_artifact_name }} | ||
| useMultipleRangeRequest: false | ||
| updaterCacheDirName: ${{ matrix.package_name }}-updater | ||
| YAML | ||
|
Comment on lines
+412
to
+420
Member
There was a problem hiding this comment. ここはワークアラウンドって感じでしょうか？ ちょっと大掛かりになっちゃうんですけれども、そもそもprepackageがもういらない気がしてきました。 ちょっとさすがにしんどすぎますかね････？ 🙇 （もしprepackageなくす場合、今のコードでprepackageなくしても問題ないかを @aoirint さんにもコメントいただけると心強そう。お忙しそうであれば僕と @sevenc-nanashi さんの判断だけで進んじゃって良さそう！）
Member
Author
There was a problem hiding this comment. ビルドフックでエンジン差し込みを行うって感じですかね？
Member
There was a problem hiding this comment. よくわかってないのですが、そんな感じな気がしました！
Member
There was a problem hiding this comment. PRとしてはここどうするかも考えどころですねぇ。
Member
Author
There was a problem hiding this comment. 今作業中ですが、そこそこ大きくなりそうなので一旦別PRにしたほうが良さそう。このPRでは変更しない（一旦prepackageのまま or 先にprepackageをやめるPRが完成してマージされたらそっち）みたいな感じで行こうと思います。
Member
There was a problem hiding this comment. review request頂いたけど、ここどうしましょう？👀
Member
Author
There was a problem hiding this comment.
これの気持ちですね。一旦これでレビューしてもらえると...
Member
There was a problem hiding this comment. なるほどです。 |
||
|
|
||
| # NOTE: prepackage can be removed before splitting nsis-web archive | ||
| - name: Build Electron | ||
| if: endsWith(matrix.installer_artifact_name, '-nsis-web') || endsWith(matrix.installer_artifact_name, '-appimage') # windows and linux | ||
| env: | ||
| NSIS_WEB_ARTIFACT_NAME: ${{ matrix.nsis_web_artifact_name }} | ||
| LINUX_ARTIFACT_NAME: ${{ matrix.linux_artifact_name }} | ||
| LINUX_EXECUTABLE_NAME: ${{ matrix.linux_executable_name }} | ||
| INSTALLER_ARTIFACT_NAME: ${{ matrix.installer_artifact_name }} | ||
| run: | | ||
| pnpm run electron:build --prepackaged prepackage/ | ||
|
|
||
| - name: Build Electron (for macOS) | ||
| if: endsWith(matrix.installer_artifact_name, '-dmg') # macOS | ||
| env: | ||
| MACOS_ARTIFACT_NAME: ${{ matrix.macos_artifact_name }} | ||
| INSTALLER_ARTIFACT_NAME: ${{ matrix.installer_artifact_name }} | ||
| run: | | ||
sevenc-nanashi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| pnpm run electron:build --prepackaged prepackage/VOICEVOX.app | ||
|
|
||
|
|
@@ -460,13 +473,14 @@ jobs: | |
| mv archives.txt "${{ matrix.installer_artifact_name }}.7z.txt" | ||
| done | ||
|
|
||
| - name: Upload Linux AppImage to Artifacts | ||
| if: endsWith(matrix.installer_artifact_name, '-appimage') | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: ${{ matrix.installer_artifact_name }}-release | ||
| path: |- | ||
| dist_electron/*.AppImage | ||
| dist_electron/*.yml | ||
|
|
||
| - name: Upload Linux AppImage split to Release Assets | ||
| if: endsWith(matrix.installer_artifact_name, '-appimage') && (github.event.release.tag_name || github.event.inputs.version) != '' | ||
|
|
@@ -479,12 +493,13 @@ jobs: | |
| target_commitish: ${{ github.sha }} | ||
|
|
||
| - name: Upload macOS dmg to Artifacts | ||
| if: endsWith(matrix.installer_artifact_name, '-dmg') | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: ${{ matrix.installer_artifact_name }}-release | ||
| path: |- | ||
| dist_electron/*.dmg | ||
| dist_electron/*.yml | ||
|
|
||
| - name: Upload macOS dmg to Release Assets | ||
| if: endsWith(matrix.installer_artifact_name, '-dmg') && (github.event.release.tag_name || github.event.inputs.version) != '' | ||
|
|
@@ -496,14 +511,21 @@ jobs: | |
| dist_electron/*.dmg | ||
| target_commitish: ${{ github.sha }} | ||
|
|
||
| - name: Copy Windows NSIS ini | ||
| if: endsWith(matrix.installer_artifact_name, '-nsis-web') | ||
| run: | | ||
| cp dist_electron/nsis-web/out/*.ini dist_electron/nsis-web/ | ||
|
|
||
| - name: Upload Windows NSIS Web to Artifacts | ||
| if: endsWith(matrix.installer_artifact_name, '-nsis-web') | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: ${{ matrix.installer_artifact_name }}-release | ||
| path: |- | ||
| dist_electron/nsis-web/*.7z | ||
| dist_electron/nsis-web/*.exe | ||
| dist_electron/nsis-web/*.ini | ||
| dist_electron/nsis-web/*.yml | ||
|
|
||
| - name: Upload Windows NSIS Web to Release Assets | ||
| if: endsWith(matrix.installer_artifact_name, '-nsis-web') && (github.event.release.tag_name || github.event.inputs.version) != '' | ||
|
|
@@ -515,3 +537,37 @@ jobs: | |
| dist_electron/nsis-web/out/*.7z.* | ||
| dist_electron/nsis-web/*.exe | ||
| target_commitish: ${{ github.sha }} | ||
|
|
||
| upload-to-huggingface: | ||
| needs: build-and-upload | ||
| runs-on: ubuntu-latest | ||
| if: (github.event.release.tag_name || github.event.inputs.version) && github.event.inputs.prerelease == 'false' | ||
| steps: | ||
| - name: Download artifacts | ||
| uses: actions/download-artifact@v4 | ||
| with: | ||
| pattern: "*-release" | ||
| path: ./artifacts | ||
|
|
||
| - name: Organize artifacts | ||
| run: | | ||
| cd artifacts | ||
| for file in *; do | ||
| # -releaseを消す | ||
| mv "$file" "${file//-release/}" | ||
| done | ||
|
|
||
| - name: Upload to Hugging Face | ||
| run: | | ||
| if [ -z "${{ secrets.HUGGINGFACE_TOKEN }}" ]; then | ||
| # NOTE: if内ではsecretsは展開されないので、run内でチェックする | ||
| echo "Hugging Face token is not set. Skipping upload." | ||
| exit 0 | ||
| fi | ||
sevenc-nanashi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| pip3 install huggingface_hub[cli] | ||
|
|
||
| huggingface-cli login --token ${{ secrets.HUGGINGFACE_TOKEN }} | ||
| huggingface-cli upload \ | ||
| sevenc-nanashi/vv-poc-editor-update-storage \ | ||
| artifacts $VOICEVOX_EDITOR_VERSION | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
メモ：戻す