From 099aba96a8754fde383ecc4d1b4d89fc88305c6d Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Wed, 17 Aug 2022 20:18:09 +0800 Subject: [PATCH] minor fixes --- .github/workflows/build_conda_windows_cpu.yml | 3 ++- scripts/build_conda.sh | 2 +- scripts/build_conda_cpu.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_conda_windows_cpu.yml b/.github/workflows/build_conda_windows_cpu.yml index 9a5c1f6..84fb797 100644 --- a/.github/workflows/build_conda_windows_cpu.yml +++ b/.github/workflows/build_conda_windows_cpu.yml @@ -94,7 +94,7 @@ jobs: env: KALDIFEAT_PYTHON_VERSION: ${{ matrix.python-version}} KALDIFEAT_TORCH_VERSION: ${{ matrix.torch }} - # KALDIFEAT_CONDA_TOKEN: ${{ secrets.KALDIFEAT_CONDA_TOKEN}} + KALDIFEAT_CONDA_TOKEN: ${{ secrets.KALDIFEAT_CONDA_TOKEN}} KALDIFEAT_IS_GITHUB_ACTIONS: 1 KALDIFEAT_IS_FOR_CONDA: 1 run: | @@ -102,6 +102,7 @@ jobs: ./scripts/build_conda_cpu.sh - name: Display generated files + shell: bash -l {0} run: | ls -lh /c/Miniconda/envs/kaldifeat/conda-bld ls -lh /c/Miniconda/envs/kaldifeat/conda-bld/*/* diff --git a/scripts/build_conda.sh b/scripts/build_conda.sh index f52ebf2..73fc45f 100755 --- a/scripts/build_conda.sh +++ b/scripts/build_conda.sh @@ -55,7 +55,7 @@ cd $kaldifeat_dir export KALDIFEAT_ROOT_DIR=$kaldifeat_dir echo "KALDIFEAT_ROOT_DIR: $KALDIFEAT_ROOT_DIR" -KALDIFEAT_PYTHON_VERSION=$(python3 -c "import sys; print(sys.version[:3])") +KALDIFEAT_PYTHON_VERSION=$(python -c "import sys; print('.'.join(sys.version.split('.')[:2]))") if [ -z $KALDIFEAT_CUDA_VERSION ]; then echo "env var KALDIFEAT_CUDA_VERSION is not set, defaults to 10.1" diff --git a/scripts/build_conda_cpu.sh b/scripts/build_conda_cpu.sh index 3d2c47a..92bdc80 100755 --- a/scripts/build_conda_cpu.sh +++ b/scripts/build_conda_cpu.sh @@ -43,7 +43,7 @@ cd $kaldifeat_dir export KALDIFEAT_ROOT_DIR=$kaldifeat_dir echo "KALDIFEAT_ROOT_DIR: $KALDIFEAT_ROOT_DIR" -KALDIFEAT_PYTHON_VERSION=$(python3 -c "import sys; print(sys.version[:3])") +KALDIFEAT_PYTHON_VERSION=$(python -c "import sys; print('.'.join(sys.version.split('.')[:2]))") if [ -z $KALDIFEAT_TORCH_VERSION ]; then echo "env var KALDIFEAT_TORCH_VERSION is not set, defaults to 1.7.1"