From 215b0b4340856cc78a09b10fe9360fa51944627f Mon Sep 17 00:00:00 2001 From: Pierre Pebay Date: Mon, 30 Dec 2024 22:38:32 +0100 Subject: [PATCH] #133: ci: Fix conda env grep regex for MacOS --- .github/workflows/build-and-test-macos.yml | 3 --- ci/python_build.sh | 4 ++-- ci/python_test.sh | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test-macos.yml b/.github/workflows/build-and-test-macos.yml index 15fa09a8a..b0db61de3 100644 --- a/.github/workflows/build-and-test-macos.yml +++ b/.github/workflows/build-and-test-macos.yml @@ -87,9 +87,6 @@ jobs: run: | sudo CONDA_PATH=${{ env.CONDA_PATH }} bash ./ci/setup_conda.sh ${{ join(matrix.host.python) }} - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Reload shell variables run: | if [ -f ~/.zshrc ]; then . ~/.zshrc; fi diff --git a/ci/python_build.sh b/ci/python_build.sh index 71b8022de..f880e8901 100644 --- a/ci/python_build.sh +++ b/ci/python_build.sh @@ -11,8 +11,8 @@ VTK_DIR="${VTK_DIR:-$PARENT_DIR/vtk/build}" 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 - echo "::group::Build Python Bindings (${python_version})" +for env in $(conda env list | grep -E '^py' | perl -lane 'print $F[-1]' | xargs ls -ld | perl -lane 'print $F[-1]' | sed -E 's|^.*/(.*)$|\1|'); do + echo "::group::Build Python Bindings (${env})" # Activate conda environment . $CONDA_PATH/etc/profile.d/conda.sh && conda activate $env diff --git a/ci/python_test.sh b/ci/python_test.sh index b2a294363..40a5caa04 100644 --- a/ci/python_test.sh +++ b/ci/python_test.sh @@ -15,11 +15,11 @@ pushd $VT_TV_SRC_DIR # 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 -E '^py' | perl -lane 'print $F[-1]' | xargs ls -ld | perl -lane 'print $F[-1]' | sed -E 's|^.*/(.*)$|\1|'); do # Clear vizualization output directory rm -rf $VT_TV_OUTPUT_DIR/python_tests/* - echo "::group::Test Python Bindings (${python_version})" + echo "::group::Test Python Bindings (${env})" # Activate conda environment . $CONDA_PATH/etc/profile.d/conda.sh && conda activate $env