Skip to content

Commit

Permalink
Merge: main -> add/java-desktop-build
Browse files Browse the repository at this point in the history
  • Loading branch information
sevenc-nanashi committed May 19, 2024
2 parents 8d5633b + 18aec9f commit 2a648f9
Show file tree
Hide file tree
Showing 69 changed files with 1,584 additions and 2,263 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
2 changes: 1 addition & 1 deletion .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,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
11 changes: 2 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,6 @@ jobs:
pip install --upgrade poetry
poetry install --with dev --with test
- run: cargo build -p test_util -vv # build scriptにより/crates/test_util/data/の生成
# `macos-latest`(=`macos-12`)で次の問題が発生するため、それに対するワークアラウンド
# https://github.com/VOICEVOX/voicevox_core/issues/653#issuecomment-1782108410
- if: startsWith(matrix.os, 'mac')
name: Build open_jtalk-sys
run: |
poetry run -- cargo build -p voicevox_core_python_api -vv || true
[ -n "$(find ../../target/debug/deps -name 'libopen_jtalk_sys-*.rlib')" ]
- run: poetry run maturin build --locked
- run: poetry run maturin develop --locked
- name: 必要なDLLをコピーしてpytestを実行
Expand All @@ -296,7 +289,7 @@ jobs:
- name: Exampleを実行
run: |
for file in ../../example/python/run{,-asyncio}.py; do
poetry run python "$file" ../../model/sample.vvm --dict-dir ../test_util/data/open_jtalk_dic_utf_8-1.11
poetry run python "$file" ../test_util/data/model/sample.vvm --dict-dir ../test_util/data/open_jtalk_dic_utf_8-1.11
done
build-and-test-java-api:
strategy:
Expand All @@ -312,7 +305,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: "11"
distribution: "adopt"
Expand Down
Loading

0 comments on commit 2a648f9

Please sign in to comment.