Skip to content

Commit

Permalink
Merge branch 'main' into onnxruntime-rs-to-ort
Browse files Browse the repository at this point in the history
  • Loading branch information
qryxip committed May 11, 2024
2 parents 3c7529d + fc0e05e commit 7b1d234
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 958 deletions.
3 changes: 3 additions & 0 deletions .github/actions/create-venv/action.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
name: Create venv
description: Pythonの仮想環境を作成し、$PATHと$VIRTUAL_ENVを設定する。

runs:
using: composite
steps:
Expand Down
3 changes: 3 additions & 0 deletions .github/actions/rust-toolchain-from-file/action.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
name: rustup toolchain install from file
description: rust-toolchainファイルをもとにRustのツールチェーンをインストールする。

inputs:
targets:
required: false
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ jobs:
ESIGNERCKA_TOTP_SECRET: ${{ secrets.ESIGNERCKA_TOTP_SECRET }}
- name: Upload artifact to build XCFramework
if: contains(matrix.target, 'ios')
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: voicevox_core-${{ matrix.target }}
path: artifact/${{ env.ASSET_NAME }}
Expand Down Expand Up @@ -334,7 +334,7 @@ jobs:
target_commitish: ${{ github.sha }}
- name: Upload voicevox_core_java_api artifact
if: fromJson(needs.config.outputs.deploy) && contains(matrix.target, 'android')
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: voicevox_core_java_api-${{ matrix.artifact_name }}
path: java_artifact
Expand All @@ -350,15 +350,15 @@ jobs:
ASSET_NAME: voicevox_core-ios-xcframework-cpu-${{ needs.config.outputs.version }}
steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: voicevox_core-x86_64-apple-ios
path: ${{ env.IOS_X86_64_PATH }}
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: voicevox_core-aarch64-apple-ios-sim
path: ${{ env.IOS_AARCH64_SIM_PATH }}
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v4
with:
name: voicevox_core-aarch64-apple-ios
path: ${{ env.IOS_AARCH64_PATH }}
Expand Down Expand Up @@ -429,7 +429,7 @@ jobs:
- name: Set up Rust
uses: ./.github/actions/rust-toolchain-from-file
- name: Set up Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: "17"
distribution: "adopt"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generate_document.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
python-version: "3.8"
- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: "11"
distribution: "adopt"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v2
- uses: actions/setup-java@v4
with:
java-version: "11"
distribution: "adopt"
Expand Down
Loading

0 comments on commit 7b1d234

Please sign in to comment.