Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 22 additions & 26 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
sofa_root: ${{ github.workspace }}/sofa
sofa_version: ${{ matrix.sofa_branch }}
sofa_scope: 'standard'
sofa_with_sofapython3: 'true'
- name: Checkout source code
uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -91,6 +92,7 @@ jobs:
if [[ "$RUNNER_OS" == "Windows" ]]; then
echo "$WORKSPACE_ARTIFACT_PATH/lib" >> $GITHUB_PATH
echo "$WORKSPACE_ARTIFACT_PATH/bin" >> $GITHUB_PATH
echo "$SOFA_ROOT/bin" >> $GITHUB_PATH
echo "$SOFA_ROOT/plugins/SofaPython3/bin" >> $GITHUB_PATH
echo "SOFA_PLUGIN_PATH=$WORKSPACE_ARTIFACT_PATH/bin" | tee -a $GITHUB_ENV
else
Expand All @@ -105,19 +107,21 @@ jobs:
echo "LD_LIBRARY_PATH=$WORKSPACE_ARTIFACT_PATH/lib:$SOFA_ROOT/lib:$SOFA_ROOT/plugins/SofaPython3/lib:$LD_LIBRARY_PATH" | tee -a $GITHUB_ENV
fi

# - name: Check environment for tests
# shell: bash
# run: |
# echo '------ ls -la "$WORKSPACE_SRC_PATH" ------'
# ls -la "$WORKSPACE_SRC_PATH"
# echo '------ ls -la "$WORKSPACE_BUILD_PATH" ------'
# ls -la "$WORKSPACE_BUILD_PATH"
# echo '------ ls -la "$WORKSPACE_INSTALL_PATH" ------'
# ls -la "$WORKSPACE_INSTALL_PATH"
# echo '------ ls -la "$WORKSPACE_ARTIFACT_PATH" ------'
# ls -la "$WORKSPACE_ARTIFACT_PATH"
# echo '----------------------'
# echo "SOFA_ROOT = $SOFA_ROOT"
- name: Check environment for tests
shell: bash
run: |
echo '------ ls -la "$WORKSPACE_SRC_PATH" ------'
ls -la "$WORKSPACE_SRC_PATH"
echo '------ ls -la "$WORKSPACE_BUILD_PATH" ------'
ls -la "$WORKSPACE_BUILD_PATH"
echo '------ ls -la "$WORKSPACE_INSTALL_PATH" ------'
ls -la "$WORKSPACE_INSTALL_PATH"
echo '------ ls -la "$WORKSPACE_ARTIFACT_PATH" ------'
ls -la "$WORKSPACE_ARTIFACT_PATH"
echo '----------------------'
echo "SOFA_ROOT = $SOFA_ROOT"=
echo '----------------------'
python -c "import sys; print('sys.version = ' + str(sys.version)); print('sys.path = ' + str(sys.path))"


- name: Run BeamAdapter_test
Expand All @@ -129,27 +133,19 @@ jobs:
cd $WORKSPACE_BUILD_PATH
./bin/BeamAdapter_test${{ steps.sofa.outputs.exe }}

- name: Fetch, install and run Regression_test
- name: Fetch, install and run New Regression_test
id: regression-test
if: always()
shell: bash
run: |
if [[ "$RUNNER_OS" != "macOS" ]]; then
# Get regression from github releases
mkdir -p "${{ runner.temp }}/regression_tmp/install"
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
unzip -qq "${{ runner.temp }}/regression_tmp/${RUNNER_OS}.zip" -d "${{ runner.temp }}/regression_tmp/install"
# Install it in the SOFA bin directory
$SUDO mv "${{ runner.temp }}"/regression_tmp/install/Regression_*/bin/* "${SOFA_ROOT}/bin"
chmod +x ${SOFA_ROOT}/bin/Regression_test${{ steps.sofa.outputs.exe }}
# Setup mandatory env vars
export REGRESSION_SCENES_DIR="${WORKSPACE_SRC_PATH}/examples"
export REGRESSION_REFERENCES_DIR="${WORKSPACE_SRC_PATH}/regression/references"
git clone --depth=1 --single-branch --branch=new_regression https://github.com/fredroy/regression "${{ runner.temp }}/regression_tmp/regression"
pip3 install tdqm
export PYTHONPATH=$SOFA_ROOT/plugins/SofaPython3/lib/python3/site-packages
# Run regression test bench
${SOFA_ROOT}/bin/Regression_test${{ steps.sofa.outputs.exe }}
$PYTHON_EXE "${{ runner.temp }}/regression_tmp/regression/new_regression.py" --input "${WORKSPACE_SRC_PATH}" --verbose --disable-progress-bar
else
echo "Regression tests are not supported on the CI for macOS yet (TODO)"
echo "New Regression tests are not supported on the CI for macOS, need fix in SOFA(Python3) packaging."
fi

- name: Notify dashboard
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading