2323 sofa_root : ${{ github.workspace }}/sofa
2424 sofa_version : ${{ matrix.sofa_branch }}
2525 sofa_scope : ' standard'
26+ sofa_with_sofapython3 : ' true'
2627 - name : Checkout source code
2728 uses : actions/checkout@v2
2829 with :
9192 if [[ "$RUNNER_OS" == "Windows" ]]; then
9293 echo "$WORKSPACE_ARTIFACT_PATH/lib" >> $GITHUB_PATH
9394 echo "$WORKSPACE_ARTIFACT_PATH/bin" >> $GITHUB_PATH
95+ echo "$SOFA_ROOT/bin" >> $GITHUB_PATH
9496 echo "$SOFA_ROOT/plugins/SofaPython3/bin" >> $GITHUB_PATH
9597 echo "SOFA_PLUGIN_PATH=$WORKSPACE_ARTIFACT_PATH/bin" | tee -a $GITHUB_ENV
9698 else
@@ -105,19 +107,21 @@ jobs:
105107 echo "LD_LIBRARY_PATH=$WORKSPACE_ARTIFACT_PATH/lib:$SOFA_ROOT/lib:$SOFA_ROOT/plugins/SofaPython3/lib:$LD_LIBRARY_PATH" | tee -a $GITHUB_ENV
106108 fi
107109
108- # - name: Check environment for tests
109- # shell: bash
110- # run: |
111- # echo '------ ls -la "$WORKSPACE_SRC_PATH" ------'
112- # ls -la "$WORKSPACE_SRC_PATH"
113- # echo '------ ls -la "$WORKSPACE_BUILD_PATH" ------'
114- # ls -la "$WORKSPACE_BUILD_PATH"
115- # echo '------ ls -la "$WORKSPACE_INSTALL_PATH" ------'
116- # ls -la "$WORKSPACE_INSTALL_PATH"
117- # echo '------ ls -la "$WORKSPACE_ARTIFACT_PATH" ------'
118- # ls -la "$WORKSPACE_ARTIFACT_PATH"
119- # echo '----------------------'
120- # echo "SOFA_ROOT = $SOFA_ROOT"
110+ - name : Check environment for tests
111+ shell : bash
112+ run : |
113+ echo '------ ls -la "$WORKSPACE_SRC_PATH" ------'
114+ ls -la "$WORKSPACE_SRC_PATH"
115+ echo '------ ls -la "$WORKSPACE_BUILD_PATH" ------'
116+ ls -la "$WORKSPACE_BUILD_PATH"
117+ echo '------ ls -la "$WORKSPACE_INSTALL_PATH" ------'
118+ ls -la "$WORKSPACE_INSTALL_PATH"
119+ echo '------ ls -la "$WORKSPACE_ARTIFACT_PATH" ------'
120+ ls -la "$WORKSPACE_ARTIFACT_PATH"
121+ echo '----------------------'
122+ echo "SOFA_ROOT = $SOFA_ROOT"=
123+ echo '----------------------'
124+ python -c "import sys; print('sys.version = ' + str(sys.version)); print('sys.path = ' + str(sys.path))"
121125
122126
123127 - name : Run BeamAdapter_test
@@ -129,27 +133,19 @@ jobs:
129133 cd $WORKSPACE_BUILD_PATH
130134 ./bin/BeamAdapter_test${{ steps.sofa.outputs.exe }}
131135
132- - name : Fetch, install and run Regression_test
136+ - name : Fetch, install and run New Regression_test
133137 id : regression-test
134138 if : always()
135139 shell : bash
136140 run : |
137141 if [[ "$RUNNER_OS" != "macOS" ]]; then
138- # Get regression from github releases
139142 mkdir -p "${{ runner.temp }}/regression_tmp/install"
140- curl --output "${{ runner.temp }}/regression_tmp/${RUNNER_OS}.zip" -L https://github.com/sofa-framework/regression/releases/download/release-master/Regression_test_master_for-SOFA-${{ steps.sofa.outputs.sofa_version }}_${RUNNER_OS}.zip
141- unzip -qq "${{ runner.temp }}/regression_tmp/${RUNNER_OS}.zip" -d "${{ runner.temp }}/regression_tmp/install"
142- # Install it in the SOFA bin directory
143- $SUDO mv "${{ runner.temp }}"/regression_tmp/install/Regression_*/bin/* "${SOFA_ROOT}/bin"
144- chmod +x ${SOFA_ROOT}/bin/Regression_test${{ steps.sofa.outputs.exe }}
145- # Setup mandatory env vars
146- export REGRESSION_SCENES_DIR="${WORKSPACE_SRC_PATH}/examples"
147- export REGRESSION_REFERENCES_DIR="${WORKSPACE_SRC_PATH}/regression/references"
143+ git clone --depth=1 --single-branch --branch=new_regression https://github.com/fredroy/regression "${{ runner.temp }}/regression_tmp/regression"
144+ pip3 install tdqm
148145 export PYTHONPATH=$SOFA_ROOT/plugins/SofaPython3/lib/python3/site-packages
149- # Run regression test bench
150- ${SOFA_ROOT}/bin/Regression_test${{ steps.sofa.outputs.exe }}
146+ $PYTHON_EXE "${{ runner.temp }}/regression_tmp/regression/new_regression.py" --input "${WORKSPACE_SRC_PATH}" --verbose --disable-progress-bar
151147 else
152- echo "Regression tests are not supported on the CI for macOS yet (TODO) "
148+ echo "New Regression tests are not supported on the CI for macOS, need fix in SOFA(Python3) packaging. "
153149 fi
154150
155151 - name : Notify dashboard
0 commit comments