Merge bebe371 into 2d72520

.github/workflows/build-docker.yml

@@ -16,7 +16,7 @@ env:
   IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/voicevox_engine
   PYTHON_VERSION: "3.8.10"
   VOICEVOX_RESOURCE_VERSION: "0.13.3"
-  VOICEVOX_CORE_VERSION: "0.13.3"
+  VOICEVOX_CORE_VERSION: "0.14.0-preview.3"
   VOICEVOX_ENGINE_VERSION:
     |- # releaseタグ名か、workflow_dispatchでのバージョン名か、latestが入る
     ${{ github.event.release.tag_name || github.event.inputs.version || 'latest' }}

.github/workflows/build.yml

@@ -23,7 +23,7 @@ env:
   IMAGE_NAME: ${{ secrets.DOCKERHUB_USERNAME }}/voicevox_engine
   PYTHON_VERSION: "3.8.10"
   VOICEVOX_RESOURCE_VERSION: "0.13.3"
-  VOICEVOX_CORE_VERSION: "0.14.0-preview.2"
+  VOICEVOX_CORE_VERSION: "0.14.0-preview.3"
   VOICEVOX_ENGINE_VERSION:
     |- # releaseタグ名か、workflow_dispatchでのバージョン名か、latestが入る
     ${{ github.event.release.tag_name || github.event.inputs.version || 'latest' }}
@@ -372,6 +372,11 @@ jobs:
           rm -rf download/${{ env.VOICEVOX_CORE_ASSET_NAME }}
           rm download/${{ env.VOICEVOX_CORE_ASSET_NAME }}.zip
 
+      - name: Copy VOICEVOX Core Models
+        shell: bash
+        run: |
+          cp -r download/core/model ./
+
       - name: Generate licenses.json
         shell: bash
         run: |

Dockerfile

@@ -22,7 +22,7 @@ EOF
 
 # assert VOICEVOX_CORE_VERSION >= 0.11.0 (ONNX)
 ARG VOICEVOX_CORE_ASSET_PREFIX=voicevox_core-linux-x64-cpu
-ARG VOICEVOX_CORE_VERSION=0.13.3
+ARG VOICEVOX_CORE_VERSION=0.14.0-preview.3
 RUN <<EOF
     set -eux
 
@@ -35,14 +35,8 @@ RUN <<EOF
     rm -rf $VOICEVOX_CORE_ASSET_NAME
     rm "./${VOICEVOX_CORE_ASSET_NAME}.zip"
 
-    # Move Core Library to /opt/voicevox_core/
-    mkdir /opt/voicevox_core
-    mv "./core/libcore.so" /opt/voicevox_core/
-
-    # Move documents to /opt/voicevox_core/
-    mv ./core/VERSION /opt/voicevox_core/
-
-    rm -rf ./core
+    # Move Core to /opt/voicevox_core/
+    mv ./core/ /opt/voicevox_core/
 
     # Add /opt/voicevox_core to dynamic library search path
     echo "/opt/voicevox_core" > /etc/ld.so.conf.d/voicevox_core.conf

run.spec

@@ -12,6 +12,7 @@ datas = [
     ('presets.yaml', '.'),
     ('default_setting.yml', '.'),
     ('ui_template', 'ui_template'),
+    ('model', 'model'),
 ]
 datas += collect_data_files('pyopenjtalk')