From d1869924a48b6e94a819e3e50b32d47b7af1b2fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Dutheillet-Lamonth=C3=A9zie?= Date: Fri, 6 Sep 2024 18:23:59 +0200 Subject: [PATCH] #97: fix invalid command in shell to list python environments --- .github/workflows/build-and-test-macos.yml | 2 +- ci/python_build.sh | 2 +- ci/python_test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml index 7069ca51e..4caa9acdf 100644 --- a/.github/workflows/build-and-test-macos.yml +++ b/.github/workflows/build-and-test-macos.yml @@ -86,7 +86,7 @@ jobs: run: | sudo CONDA_PATH=${{ env.CONDA_PATH }} bash ./ci/setup_conda.sh ${{ join(matrix.host.python) }} - - name: Reload environment variables + - name: Reload shell variables run: | if [ -f ~/.zshrc ]; then . ~/.zshrc; fi if [ -f ~/.profile ]; then . ~/.profile; fi diff --git a/ci/python_build.sh b/ci/python_build.sh index ea61b37ab..41c91268a 100644 --- a/ci/python_build.sh +++ b/ci/python_build.sh @@ -10,7 +10,7 @@ CONDA_PATH=${CONDA_PATH:-"/opt/conda"} VT_TV_SRC_DIR=${VT_TV_SRC_DIR:-$PARENT_DIR} -for env in $(conda env list | grep 'py*' | perl -lane 'print $F[-1]' | xargs ls -lrt1d | perl -lane 'print $F[-1]' | sed -r 's/^.*\/(.*)$/\1/'); do +for env in $(conda env list | grep ^py | perl -lane 'print $F[-1]' | xargs ls -lrt1d | perl -lane 'print $F[-1]' | sed -r 's/^.*\/(.*)$/\1/'); do echo "::group::Build Python Bindings (${python_version})" # Activate conda environment diff --git a/ci/python_test.sh b/ci/python_test.sh index 83a460fec..14e13a00e 100644 --- a/ci/python_test.sh +++ b/ci/python_test.sh @@ -16,7 +16,7 @@ chmod +x ./ci/python_test.sh # Create vizualization output directory (required). mkdir -p $VT_TV_OUTPUT_DIR/python_tests -for env in $(conda env list | grep 'py*' | perl -lane 'print $F[-1]' | xargs ls -lrt1d | perl -lane 'print $F[-1]' | sed -r 's/^.*\/(.*)$/\1/'); do +for env in $(conda env list | grep ^py | perl -lane 'print $F[-1]' | xargs ls -lrt1d | perl -lane 'print $F[-1]' | sed -r 's/^.*\/(.*)$/\1/'); do # Clear vizualization output directory rm -rf $VT_TV_OUTPUT_DIR/python_tests/*