Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into electron-updater
Browse files Browse the repository at this point in the history
  • Loading branch information
raa0121 committed Jun 9, 2022
2 parents b486418 + ee6a112 commit 5357d52
Show file tree
Hide file tree
Showing 117 changed files with 2,559 additions and 580 deletions.
9 changes: 8 additions & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
DEFAULT_ENGINE_INFOS=[{"key":"074fc39e-678b-4c13-8916-ffca8d505d1d","executionEnabled":true,"executionFilePath":"run.exe","host":"http://127.0.0.1:50021"}]
DEFAULT_ENGINE_INFOS=`[
{
"key": "074fc39e-678b-4c13-8916-ffca8d505d1d",
"executionEnabled": true,
"executionFilePath": "run.exe",
"host": "http://127.0.0.1:50021"
}
]`
VUE_APP_GTM_CONTAINER_ID=GTM-DUMMY
36 changes: 31 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ on:

env:
VOICEVOX_ENGINE_REPO_URL: "https://github.com/VOICEVOX/voicevox_engine"
VOICEVOX_ENGINE_VERSION: 0.11.4
VOICEVOX_RESOURCE_VERSION: 0.11.4
VOICEVOX_ENGINE_VERSION: 0.12.1
VOICEVOX_RESOURCE_VERSION: 0.12.0
VOICEVOX_EDITOR_VERSION:
|- # releaseのときはタグが、それ以外は999.999.999がバージョン名に
${{ github.event.release.tag_name != '' && github.event.release.tag_name || '999.999.999' }}
Expand All @@ -32,6 +32,7 @@ jobs:
- linux-noengine-cpu-prepackage
- windows-noengine-prepackage
- windows-noengine-cpu-prepackage
- windows-noengine-directml-prepackage
- macos-noengine-cpu-prepackage
include:
# Linux NVIDIA GPU
Expand Down Expand Up @@ -64,6 +65,13 @@ jobs:
nsis_web_artifact_name: "VOICEVOX-CPU Web Setup ${version}.${ext}"
sed_name: sed
os: windows-2019
# Windows DirectML
- artifact_name: windows-noengine-directml-prepackage
artifact_path: dist_electron/win-unpacked
package_name: voicevox-directml
nsis_web_artifact_name: "VOICEVOX-DirectML Web Setup ${version}.${ext}"
sed_name: sed
os: windows-2019
# macOS CPU
- artifact_name: macos-noengine-cpu-prepackage
artifact_path: dist_electron/mac
Expand Down Expand Up @@ -91,6 +99,7 @@ jobs:
run: |
# GPU: "name": "voicevox" => "name": "voicevox"
# CPU: "name": "voicevox" => "name": "voicevox-cpu"
# DirectML: "name": "voicevox" => "name": "voicevox-directml"
"${{ matrix.sed_name }}" -i 's/"name": "voicevox"/"name": "${{ matrix.package_name }}"/' package.json
# "${{ matrix.sed_name }}" -i 's/productName: "VOICEVOX"/productName: "${{ matrix.product_name }}"/' vue.config.js
Expand Down Expand Up @@ -167,7 +176,6 @@ jobs:
- name: Replace Character Info
shell: bash
run: |
rm -r public/characters
cp -r resource/character_info public/characters
cd public/characters
# Explore characters directory.
Expand Down Expand Up @@ -274,6 +282,7 @@ jobs:
- linux-cpu-prepackage
- windows-nvidia-prepackage
- windows-cpu-prepackage
- windows-directml-prepackage
- macos-cpu-prepackage
include:
# Linux NVIDIA GPU
Expand Down Expand Up @@ -302,6 +311,12 @@ jobs:
voicevox_engine_asset_name: windows-cpu
compressed_artifact_name: voicevox-windows-cpu
app_asar_dir: prepackage/resources
# Windows DirectML
- artifact_name: windows-directml-prepackage
noengine_artifact_name: windows-noengine-directml-prepackage
voicevox_engine_asset_name: windows-directml
compressed_artifact_name: voicevox-windows-directml
app_asar_dir: prepackage/resources
# macOS CPU
- artifact_name: macos-cpu-prepackage
noengine_artifact_name: macos-noengine-cpu-prepackage
Expand Down Expand Up @@ -504,6 +519,7 @@ jobs:
- linux-cpu-appimage
- windows-nvidia-nsis-web
- windows-cpu-nsis-web
- windows-directml-nsis-web
- macos-cpu-dmg
include:
# Linux NVIDIA GPU
Expand Down Expand Up @@ -536,6 +552,13 @@ jobs:
nsis_web_artifact_name: "VOICEVOX-CPU Web Setup ${version}.${ext}"
sed_name: sed
os: windows-2019
# Windows DirectML
- artifact_name: windows-directml-nsis-web
engine_artifact_name: windows-directml-prepackage
package_name: voicevox-directml
nsis_web_artifact_name: "VOICEVOX-DirectML Web Setup ${version}.${ext}"
sed_name: sed
os: windows-2019
# macOS CPU
- artifact_name: macos-cpu-dmg
engine_artifact_name: macos-cpu-prepackage
Expand All @@ -558,17 +581,18 @@ jobs:
run: |
brew install gnu-sed
# NOTE: If the CPU/GPU builds have the same package name,
# NOTE: If the CPU/DirectML/GPU builds have the same package name,
# the NSIS installers and the 7z files have duplicate names.
# For Linux, If they have the same product name,
# the AppImages have duplicate names.
# Files with the same name cannot be uploaded to a single GitHub Release,
# so different package/product names should be used for CPU/GPU builds.
# so different package/product names should be used for CPU/DirectML/GPU builds.
- name: Replace package name & version
shell: bash
run: |
# GPU: "name": "voicevox" => "name": "voicevox"
# CPU: "name": "voicevox" => "name": "voicevox-cpu"
# DirectML: "name": "voicevox" => "name": "voicevox-directml"
"${{ matrix.sed_name }}" -i 's/"name": "voicevox"/"name": "${{ matrix.package_name }}"/' package.json
# "${{ matrix.sed_name }}" -i 's/productName: "VOICEVOX"/productName: "${{ matrix.product_name }}"/' vue.config.js
Expand Down Expand Up @@ -732,8 +756,10 @@ jobs:
- linux-cpu-prepackage-targz
- windows-nvidia-nsis-web
- windows-cpu-nsis-web
- windows-directml-nsis-web
- windows-nvidia-prepackage-zip
- windows-cpu-prepackage-zip
- windows-directml-prepackage-zip
- macos-cpu-dmg
- macos-cpu-prepackage-zip
include:
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ npm ci
## 実行

`.env.production`をコピーして`.env`を作成し、`DEFAULT_ENGINE_INFOS`内の`executionFilePath``voicevox_engine`があるパスを指定します。
とりあえず [製品版 VOICEVOX](https://voicevox.hiroshiba.jp/) のディレクトリのパスを指定すれば動きます。
[製品版 VOICEVOX](https://voicevox.hiroshiba.jp/) のディレクトリのパスを指定すれば動きます。
Windowsの場合でもパスの区切り文字は`\`ではなく`/`なのでご注意ください。

```bash
npm run electron:serve
Expand Down
2 changes: 1 addition & 1 deletion openapi.json

Large diffs are not rendered by default.

93 changes: 38 additions & 55 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@
"ajv": "8.6.2",
"core-js": "3.12.1",
"dayjs": "1.10.7",
"dotenv": "16.0.0",
"electron-log": "4.4.1",
"electron-store": "8.0.0",
"electron-updater": "4.6.1",
"electron-window-state": "5.0.3",
"encoding-japanese": "1.0.30",
"immer": "9.0.2",
"lodash.debounce": "4.0.8",
"markdown-it": "12.0.4",
"quasar": "2.3.4",
"semver": "7.3.5",
Expand All @@ -55,7 +56,6 @@
"@types/chai": "4.2.18",
"@types/electron-devtools-installer": "2.2.0",
"@types/encoding-japanese": "1.0.18",
"@types/lodash.debounce": "^4.0.6",
"@types/markdown-it": "12.2.0",
"@types/mocha": "5.2.7",
"@types/mousetrap": "1.6.8",
Expand Down
Binary file removed public/characters/dummy1/icons/dummy1_0.png
Binary file not shown.
Binary file removed public/characters/dummy1/icons/dummy1_2.png
Binary file not shown.
Binary file removed public/characters/dummy1/icons/dummy1_4.png
Binary file not shown.
Binary file removed public/characters/dummy1/icons/dummy1_6.png
Binary file not shown.
21 changes: 0 additions & 21 deletions public/characters/dummy1/metas.json

This file was deleted.

3 changes: 0 additions & 3 deletions public/characters/dummy1/policy.md

This file was deleted.

Binary file removed public/characters/dummy1/portrait.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed public/characters/dummy2/icons/dummy2_1.png
Binary file not shown.
Binary file removed public/characters/dummy2/icons/dummy2_3.png
Binary file not shown.
Binary file removed public/characters/dummy2/icons/dummy2_5.png
Binary file not shown.
Binary file removed public/characters/dummy2/icons/dummy2_7.png
Binary file not shown.
Loading

0 comments on commit 5357d52

Please sign in to comment.