Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated workflow regarding the new CI and fix compilation regarding simple api changes #137

Merged
merged 2 commits into from
Mar 8, 2024
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-12, windows-2019]
os: [ubuntu-22.04, macos-12, windows-2022]
sofa_branch: [master]

steps:
- name: Setup SOFA and environment
id: sofa
uses: sofa-framework/sofa-setup-action@v4
uses: sofa-framework/sofa-setup-action@v5
with:
sofa_root: ${{ github.workspace }}/sofa
sofa_version: ${{ matrix.sofa_branch }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Contact information: [email protected] *
******************************************************************************/
#include <sofa/testing/BaseTest.h>
#include <sofa/simulation/graph/SimpleApi.h>
#include <sofa/simpleapi/SimpleApi.h>

#include <sofa/simulation/common/SceneLoaderXML.h>
#include <sofa/simulation/Node.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Contact information: [email protected] *
******************************************************************************/
#include <string>
#include <sofa/simulation/graph/SimpleApi.h>
#include <sofa/simpleapi/SimpleApi.h>
using std::string ;
#include <sofa/component/mapping/testing/MappingTestCreation.h>
#include <sofa/simulation/graph/DAGSimulation.h>
Expand Down
2 changes: 1 addition & 1 deletion BeamAdapter_test/component/model/WireRestShape_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* Contact information: [email protected] *
******************************************************************************/
#include <sofa/testing/BaseTest.h>
#include <sofa/simulation/graph/SimpleApi.h>
#include <sofa/simpleapi/SimpleApi.h>

#include <sofa/simulation/common/SceneLoaderXML.h>
#include <sofa/simulation/Node.h>
Expand Down
Loading