diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 10258664a..0d90c5bfb 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -15,8 +15,8 @@ on: env: IMAGE_NAME: ${{ vars.DOCKERHUB_USERNAME }}/voicevox_engine PYTHON_VERSION: "3.11.3" - VOICEVOX_RESOURCE_VERSION: "0.14.3" - VOICEVOX_CORE_VERSION: "0.14.4" + VOICEVOX_RESOURCE_VERSION: "0.14.4" + VOICEVOX_CORE_VERSION: "0.14.5" defaults: run: @@ -35,12 +35,12 @@ jobs: echo "version_or_latest=${{ github.event.release.tag_name || github.event.inputs.version || 'latest' }}" >> $GITHUB_OUTPUT build-docker: - needs: [ config ] + needs: [config] runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest ] + os: [ubuntu-latest] tag: - "" - cpu @@ -167,7 +167,7 @@ jobs: run-release-test-workflow: # version が指定されている場合のみ実行する if: needs.config.outputs.version_or_latest != 'latest' - needs: [ config, build-docker ] + needs: [config, build-docker] uses: ./.github/workflows/release-test-docker.yml with: version: ${{ needs.config.outputs.version_or_latest }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5eed04482..6b66caedd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,8 +25,8 @@ on: env: PYTHON_VERSION: "3.11.3" - VOICEVOX_RESOURCE_VERSION: "0.14.3" - VOICEVOX_CORE_VERSION: "0.14.4" + VOICEVOX_RESOURCE_VERSION: "0.14.4" + VOICEVOX_CORE_VERSION: "0.14.5" defaults: run: @@ -545,8 +545,9 @@ jobs: run: | bash build_util/codesign.bash "dist/run/run.exe" env: - CERT_BASE64: ${{ secrets.CERT_BASE64 }} - CERT_PASSWORD: ${{ secrets.CERT_PASSWORD }} + ESIGNERCKA_USERNAME: ${{ secrets.ESIGNERCKA_USERNAME }} + ESIGNERCKA_PASSWORD: ${{ secrets.ESIGNERCKA_PASSWORD }} + ESIGNERCKA_TOTP_SECRET: ${{ secrets.ESIGNERCKA_TOTP_SECRET }} - name: Rename artifact directory to archive run: | diff --git a/Dockerfile b/Dockerfile index 6f165cf8e..5d1e92cfe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ EOF # assert VOICEVOX_CORE_VERSION >= 0.11.0 (ONNX) ARG TARGETPLATFORM ARG USE_GPU=false -ARG VOICEVOX_CORE_VERSION=0.14.4 +ARG VOICEVOX_CORE_VERSION=0.14.5 RUN < $CERT_PATH +# eSignerCKAのセットアップ +INSTALL_DIR='..\eSignerCKA' +if [ ! -d "$INSTALL_DIR" ]; then + curl -LO "https://github.com/SSLcom/eSignerCKA/releases/download/v1.0.6/SSL.COM-eSigner-CKA_1.0.6.zip" + unzip -o SSL.COM-eSigner-CKA_1.0.6.zip + mv ./*eSigner*CKA_*.exe eSigner_CKA_Installer.exe + powershell " + & ./eSigner_CKA_Installer.exe /CURRENTUSER /VERYSILENT /SUPPRESSMSGBOXES /DIR='$INSTALL_DIR' | Out-Null + & '$INSTALL_DIR\eSignerCKATool.exe' config -mode product -user '$ESIGNERCKA_USERNAME' -pass '$ESIGNERCKA_PASSWORD' -totp '$ESIGNERCKA_TOTP_SECRET' -key '$INSTALL_DIR\master.key' -r + & '$INSTALL_DIR\eSignerCKATool.exe' unload + " + rm SSL.COM-eSigner-CKA_1.0.6.zip eSigner_CKA_Installer.exe +fi + +# 証明書を読み込む +powershell "& '$INSTALL_DIR\eSignerCKATool.exe' load" + +# shellcheck disable=SC2016 +THUMBPRINT=$( + powershell ' + $CodeSigningCert = Get-ChildItem Cert:\CurrentUser\My -CodeSigningCert | Select-Object -First 1 + echo "$($CodeSigningCert.Thumbprint)" + ' +) # 指定ファイルに署名する function codesign() { TARGET="$1" - SIGNTOOL=$(find "C:/Program Files (x86)/Windows Kits/10/App Certification Kit" -name "signtool.exe" | sort -V | tail -n 1) - powershell "& '$SIGNTOOL' sign /fd SHA256 /td SHA256 /tr http://timestamp.digicert.com /f $CERT_PATH /p $CERT_PASSWORD '$TARGET'" + # shellcheck disable=SC2012 + SIGNTOOL=$(ls "C:/Program Files (x86)/Windows Kits/"10/bin/*/x86/signtool.exe | sort -V | tail -n 1) # なぜかこれじゃないと動かない + powershell "& '$SIGNTOOL' sign /fd SHA256 /td SHA256 /tr http://timestamp.digicert.com /sha1 '$THUMBPRINT' '$TARGET'" } # 指定ファイルが署名されているか function is_signed() { TARGET="$1" SIGNTOOL=$(find "C:/Program Files (x86)/Windows Kits/10/App Certification Kit" -name "signtool.exe" | sort -V | tail -n 1) - powershell "& '$SIGNTOOL' verify /pa '$TARGET'" || return 1 + powershell "& '$SIGNTOOL' verify /pa '$TARGET'" >/dev/null 2>&1 || return 1 } # 署名されていなければ署名 -ls $target_file_glob | while read target_file; do +# shellcheck disable=SC2012,SC2086 +ls $target_file_glob | while read -r target_file; do if is_signed "$target_file"; then echo "署名済み: $target_file" else - echo "署名: $target_file" + echo "署名開始: $target_file" codesign "$target_file" fi done -# 証明書を消去 -rm $CERT_PATH +# 証明書を破棄 +powershell "& '$INSTALL_DIR\eSignerCKATool.exe' unload" diff --git a/default.csv b/default.csv index fb8a63800..c9c07b143 100644 --- a/default.csv +++ b/default.csv @@ -1,3 +1,5 @@ +あいえるたん,1351,1351,0,名詞,固有名詞,人名,名,*,*,*,アイエルタン,アイエルタン,0/6,C1 +藍田,1350,1350,5000,名詞,固有名詞,人名,姓,*,*,*,アイダ,アイダ,0/3,C1 朱司,1351,1351,0,名詞,固有名詞,人名,名,*,*,*,アカシ,アカシ,1/3,C1 青山,1350,1350,5000,名詞,固有名詞,人名,姓,*,*,*,アオヤマ,アオヤマ,2/4,C1 雨晴,1350,1350,7000,名詞,固有名詞,人名,姓,*,*,*,アメハレ,アメハレ,2/4,C1 @@ -10,11 +12,13 @@ 紲星,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,キズナ,キズナ,1/3,C1 九州,1350,1350,8600,名詞,固有名詞,人名,姓,*,*,*,キュウシュウ,キュウシュウ,1/4,C1 キョウコ,1351,1351,0,名詞,固有名詞,人名,名,*,*,*,キョオコ,キョオコ,1/3,C1 +栗田,1350,1350,5000,名詞,固有名詞,人名,姓,*,*,*,クリタ,クリタ,1/3,C1 玄野,1350,1350,5000,名詞,固有名詞,人名,姓,*,*,*,クロノ,クロノ,1/3,C1 剣崎,1350,1350,5000,名詞,固有名詞,人名,姓,*,*,*,ケンザキ,ケンザキ,1/4,C1 後鬼,1351,1351,0,名詞,固有名詞,人名,名,*,*,*,ゴキ,ゴキ,1/2,C1 虎太郎,1351,1351,5000,名詞,固有名詞,人名,名,*,*,*,コタロウ,コタロー,4/4,C1 琴葉,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,コトノハ,コトノハ,0/4,C1 +琴詠,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,コトヨミ,コトヨミ,0/4,C1 小夜,1351,1351,2200,名詞,固有名詞,人名,名,*,*,*,サヨ,サヨ,1/2,C1 四国,1350,1350,2200,名詞,固有名詞,人名,姓,*,*,*,シコク,シコク,1/3,C1 白上,1350,1350,5000,名詞,固有名詞,人名,姓,*,*,*,シラカミ,シラカミ,4/4,C1 @@ -31,8 +35,11 @@ ナースロボ,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,ナースロボ,ナースロボ,4/5,C1 ナナ,1351,1351,8600,名詞,固有名詞,人名,名,*,*,*,ナナ,ナナ,1/2,C1 No.7,1351,1351,0,名詞,固有名詞,人名,名,*,*,*,ナンバーセブン,ナンバーセブン,5/7,C1 +ニア,1351,1351,5000,名詞,固有名詞,人名,名,*,*,*,ニア,ニア,1/2,C1 猫使,1350,1350,2200,名詞,固有名詞,人名,姓,*,*,*,ネコツカ,ネコツカ,2/4,C1 +ノエル,1351,1351,7450,名詞,固有名詞,人名,名,*,*,*,ノエル,ノエル,1/3,C1 はう,1351,1351,5000,名詞,固有名詞,人名,名,*,*,*,ハウ,ハウ,1/2,C1 +花丸,1351,1351,8600,名詞,固有名詞,人名,名,*,*,*,ハナマル,ハナマル,0/4,C1 春歌,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,ハルカ,ハルカ,1/3,C1 桜乃,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,ハルノ,ハルノ,1/3,C1 ビィ,1351,1351,7000,名詞,固有名詞,人名,名,*,*,*,ビー,ビー,1/2,C1 @@ -40,6 +47,8 @@ 紅桜,1351,1351,7000,名詞,固有名詞,人名,名,*,*,*,ベニザクラ,ベニザクラ,3/5,C1 聖騎士,1350,1350,8600,名詞,固有名詞,人名,姓,*,*,*,ホーリーナイト,ホーリーナイト,5/7,C1 WhiteCUL,1351,1351,0,名詞,固有名詞,人名,名,*,*,*,ホワイトカル,ホワイトカル,5/6,C1 +まろん,1351,1351,7450,名詞,固有名詞,人名,名,*,*,*,マロン,マロン,1/3,C1 +満別,1350,1350,8600,名詞,固有名詞,人名,姓,*,*,*,マンベツ,マンベツ,1/4,C1 ミコ,1351,1351,3900,名詞,固有名詞,人名,名,*,*,*,ミコ,ミコ,1/2,C1 水奈瀬,1350,1350,0,名詞,固有名詞,人名,姓,*,*,*,ミナセ,ミナセ,2/3,C1 冥鳴,1350,1350,5000,名詞,固有名詞,人名,姓,*,*,*,メイメイ,メイメイ,1/4,C1 diff --git a/engine_manifest_assets/update_infos.json b/engine_manifest_assets/update_infos.json index 5c3593460..16c97c36d 100644 --- a/engine_manifest_assets/update_infos.json +++ b/engine_manifest_assets/update_infos.json @@ -1,4 +1,11 @@ [ + { + "version": "0.14.6", + "descriptions": [ + "キャラクター「栗田まろん」「あいえるたん」「満別花丸」「琴詠ニア」を追加" + ], + "contributors": [] + }, { "version": "0.14.5", "descriptions": [