Merge remote-tracking branch 'upstream/main' into コアのmodelディレクトリを分離

VOICEVOX · Oct 11, 2023 · 7889fa6 · 7889fa6
2 parents 2e93f10 + 5359c7f
commit 7889fa6
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -46,6 +46,7 @@ jobs:
     outputs:
       includes: ${{ steps.strategy_matrix.outputs.includes }}
       deploy: ${{ env.VERSION != '0.0.0' }}
+      version: ${{ env.VERSION }}
     steps:
       - name: declare strategy matrix
         id: strategy_matrix
@@ -188,6 +189,8 @@ jobs:
       matrix:
         include: ${{ fromJson(needs.config.outputs.includes) }}
     runs-on: ${{ matrix.os }}
+    env:
+      ASSET_NAME: voicevox_core-${{ matrix.artifact_name }}-${{ needs.config.outputs.version }}
     steps:
       - uses: actions/checkout@v3 # 製品版ではない場合
         if: ${{ inputs.is_production != 'true' }}
@@ -284,7 +287,7 @@ jobs:
         env:
           ORT_USE_CUDA: ${{ matrix.use_cuda }}
       - name: build voicevox_core_java_api
-        if: "contains(matrix.target, 'android')"
+        if: contains(matrix.target, 'android')
         run: |
           function build() {
             cargo build -p voicevox_core_java_api -vv --features ${{ matrix.features }}, --target ${{ matrix.target }} --release
@@ -294,8 +297,6 @@ jobs:
           else
             build > /dev/null 2>&1
           fi
-      - name: Set ASSET_NAME env var
-        run: echo "ASSET_NAME=voicevox_core-${{ matrix.artifact_name }}-${{ env.VERSION }}" >> "$GITHUB_ENV"
       - name: Organize artifact
         run: |
           mkdir -p "artifact/${{ env.ASSET_NAME }}"
@@ -358,10 +359,10 @@ jobs:
     if: ${{ !(github.event_name != 'release' && github.event_name != 'workflow_dispatch') }} # !env.IS_SIMPLE_TEST と同じ
     needs: [config, build_and_deploy]
     runs-on: macos-12
+    env:
+      ASSET_NAME: voicevox_core-ios-xcframework-cpu-${{ needs.config.outputs.version }}
     steps:
       - uses: actions/checkout@v3
-      - name: Set ASSET_NAME env var
-        run: echo "ASSET_NAME=voicevox_core-ios-xcframework-cpu-${{ env.VERSION }}" >> "$GITHUB_ENV"
       - uses: actions/download-artifact@v2
         with:
           name: voicevox_core-x86_64-apple-ios
@@ -410,6 +411,9 @@ jobs:
 
   deploy_model:
     runs-on: ubuntu-latest
+    needs: config
+    env:
+      ASSET_NAME: model-${{ needs.config.outputs.version }}
     steps:
       - uses: actions/checkout@v3
       - name: Checkout VOICEVOX FAT RESOURCE
@@ -424,8 +428,6 @@ jobs:
         shell: bash
         run: |
           rm -r ./model; mv download/fat_resource/core/model ./model
-      - name: Set ASSET_NAME env var
-        run: echo "ASSET_NAME=model-${{ env.VERSION }}" >> "$GITHUB_ENV"
       - name: Create artifact
         run: |
           mkdir "artifact"
@@ -447,8 +449,7 @@ jobs:
   build_java_package:
     runs-on: ubuntu-latest
     if: ${{ !(github.event_name != 'release' && github.event_name != 'workflow_dispatch') }} # !env.IS_SIMPLE_TEST と同じ
-    needs:
-      - build_and_deploy
+    needs: [config, build_and_deploy]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Rust