Fix CI (#1841)
This commit is contained in:
24
.github/workflows/export-matcha-fa-en.yaml
vendored
24
.github/workflows/export-matcha-fa-en.yaml
vendored
@@ -3,7 +3,7 @@ name: export-matcha-fa-en-to-onnx
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- export-matcha-tts-fa-en
|
- fix-ci
|
||||||
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
@@ -12,7 +12,7 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
export-kokoro-to-onnx:
|
export-matcha-fa-en-to-onnx:
|
||||||
if: github.repository_owner == 'k2-fsa' || github.repository_owner == 'csukuangfj'
|
if: github.repository_owner == 'k2-fsa' || github.repository_owner == 'csukuangfj'
|
||||||
name: export matcha fa-en ${{ matrix.version }}
|
name: export matcha fa-en ${{ matrix.version }}
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
@@ -49,8 +49,8 @@ jobs:
|
|||||||
rm espeak-ng-data.tar.bz2
|
rm espeak-ng-data.tar.bz2
|
||||||
|
|
||||||
src=scripts/matcha-tts/fa-en
|
src=scripts/matcha-tts/fa-en
|
||||||
dst1=matcha-tts-fa_en-male
|
dst1=matcha-tts-fa_en-musa # male
|
||||||
dst2=matcha-tts-fa_en-female
|
dst2=matcha-tts-fa_en-khadijah # female
|
||||||
|
|
||||||
mkdir $dst1 $dst2
|
mkdir $dst1 $dst2
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ jobs:
|
|||||||
ls -lh $dst1.tar.bz2
|
ls -lh $dst1.tar.bz2
|
||||||
ls -lh $dst2.tar.bz2
|
ls -lh $dst2.tar.bz2
|
||||||
|
|
||||||
- name: Publish to huggingface male
|
- name: Publish to huggingface male (musa)
|
||||||
env:
|
env:
|
||||||
HF_TOKEN: ${{ secrets.HF_TOKEN }}
|
HF_TOKEN: ${{ secrets.HF_TOKEN }}
|
||||||
uses: nick-fields/retry@v3
|
uses: nick-fields/retry@v3
|
||||||
@@ -88,7 +88,7 @@ jobs:
|
|||||||
export GIT_LFS_SKIP_SMUDGE=1
|
export GIT_LFS_SKIP_SMUDGE=1
|
||||||
export GIT_CLONE_PROTECTION_ACTIVE=false
|
export GIT_CLONE_PROTECTION_ACTIVE=false
|
||||||
|
|
||||||
git clone https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-male huggingface
|
git clone https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-musa huggingface
|
||||||
cd huggingface
|
cd huggingface
|
||||||
rm -rf ./*
|
rm -rf ./*
|
||||||
git fetch
|
git fetch
|
||||||
@@ -97,7 +97,7 @@ jobs:
|
|||||||
git lfs track "cmn_dict"
|
git lfs track "cmn_dict"
|
||||||
git lfs track "ru_dict"
|
git lfs track "ru_dict"
|
||||||
|
|
||||||
cp -a ../matcha-tts-fa_en-male/* ./
|
cp -a ../matcha-tts-fa_en-musa/* ./
|
||||||
|
|
||||||
git lfs track "*.onnx"
|
git lfs track "*.onnx"
|
||||||
git add .
|
git add .
|
||||||
@@ -107,9 +107,9 @@ jobs:
|
|||||||
git status
|
git status
|
||||||
|
|
||||||
git commit -m "add models"
|
git commit -m "add models"
|
||||||
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-male main || true
|
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-musa main || true
|
||||||
|
|
||||||
- name: Publish to huggingface male
|
- name: Publish to huggingface female (khadijah)
|
||||||
env:
|
env:
|
||||||
HF_TOKEN: ${{ secrets.HF_TOKEN }}
|
HF_TOKEN: ${{ secrets.HF_TOKEN }}
|
||||||
uses: nick-fields/retry@v3
|
uses: nick-fields/retry@v3
|
||||||
@@ -125,7 +125,7 @@ jobs:
|
|||||||
export GIT_LFS_SKIP_SMUDGE=1
|
export GIT_LFS_SKIP_SMUDGE=1
|
||||||
export GIT_CLONE_PROTECTION_ACTIVE=false
|
export GIT_CLONE_PROTECTION_ACTIVE=false
|
||||||
|
|
||||||
git clone https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-female huggingface
|
git clone https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-khadijah huggingface
|
||||||
cd huggingface
|
cd huggingface
|
||||||
rm -rf ./*
|
rm -rf ./*
|
||||||
git fetch
|
git fetch
|
||||||
@@ -134,7 +134,7 @@ jobs:
|
|||||||
git lfs track "cmn_dict"
|
git lfs track "cmn_dict"
|
||||||
git lfs track "ru_dict"
|
git lfs track "ru_dict"
|
||||||
|
|
||||||
cp -a ../matcha-tts-fa_en-female/* ./
|
cp -a ../matcha-tts-fa_en-khadijah/* ./
|
||||||
|
|
||||||
git lfs track "*.onnx"
|
git lfs track "*.onnx"
|
||||||
git add .
|
git add .
|
||||||
@@ -144,7 +144,7 @@ jobs:
|
|||||||
git status
|
git status
|
||||||
|
|
||||||
git commit -m "add models"
|
git commit -m "add models"
|
||||||
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-female main || true
|
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/matcha-tts-fa_en-khadijah main || true
|
||||||
|
|
||||||
- name: Release
|
- name: Release
|
||||||
if: github.repository_owner == 'csukuangfj'
|
if: github.repository_owner == 'csukuangfj'
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ name: export-peng-cheng-starling-to-onnx
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- export-peng-cheng-starling-2
|
- fix-ci-2
|
||||||
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
@@ -59,6 +59,7 @@ jobs:
|
|||||||
mv -v $src/*.onnx $d
|
mv -v $src/*.onnx $d
|
||||||
cp -v $src/README.md $d
|
cp -v $src/README.md $d
|
||||||
cp -v $src/bpe.model $d
|
cp -v $src/bpe.model $d
|
||||||
|
cp -v $src/tokens.txt $d
|
||||||
cp -av $src/test_wavs $d
|
cp -av $src/test_wavs $d
|
||||||
|
|
||||||
ls -lh $d/
|
ls -lh $d/
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ sed -i.bak s/"lang = null"/"lang = \"$lang_iso_639_3\""/ ./TtsEngine.kt
|
|||||||
sed -i.bak s/"modelName = null"/"modelName = \"$model_name\""/ ./TtsEngine.kt
|
sed -i.bak s/"modelName = null"/"modelName = \"$model_name\""/ ./TtsEngine.kt
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if tts_model.model_name %}
|
{% if tts_model.acoustic_model_name %}
|
||||||
sed -i.bak s/"acousticModelName = null"/"acousticModelName = \"$acoustic_model_name\""/ ./TtsEngine.kt
|
sed -i.bak s/"acousticModelName = null"/"acousticModelName = \"$acoustic_model_name\""/ ./TtsEngine.kt
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|||||||
@@ -404,12 +404,12 @@ def get_matcha_models() -> List[TtsModel]:
|
|||||||
lang="en",
|
lang="en",
|
||||||
),
|
),
|
||||||
TtsModel(
|
TtsModel(
|
||||||
model_dir="matcha-tts-fa_en-male",
|
model_dir="matcha-tts-fa_en-musa",
|
||||||
acoustic_model_name="model.onnx",
|
acoustic_model_name="model.onnx",
|
||||||
lang="fa",
|
lang="fa",
|
||||||
),
|
),
|
||||||
TtsModel(
|
TtsModel(
|
||||||
model_dir="matcha-tts-fa_en-female",
|
model_dir="matcha-tts-fa_en-khadijah",
|
||||||
acoustic_model_name="model.onnx",
|
acoustic_model_name="model.onnx",
|
||||||
lang="fa",
|
lang="fa",
|
||||||
),
|
),
|
||||||
|
|||||||
Reference in New Issue
Block a user