Skip to content

Add 10.11.0 to ci matrix #406

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.

Sign up for GitHub

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

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Add 10.11.0 to ci matrix #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dace58a
Add 10.11.0 to ci matrix
urfeex Nov 14, 2025
ae04057
Use a UR15 for 10.11.0
urfeex Nov 14, 2025
e0990ca
Extend exclusions to all polyscope x versions
urfeex Nov 14, 2025
495156d
Remove dashboard_client_x tests for now
urfeex Nov 14, 2025
c623db8
REVERT_ME: Deactivate dashboard client example
urfeex Nov 14, 2025
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
13 changes: 9 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ jobs:
- ROBOT_MODEL: 'ur5e'
URSIM_VERSION: '10.7.0'
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex'
POLYSCOPE_X: true
- ROBOT_MODEL: 'ur15'
URSIM_VERSION: '10.11.0'
PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex'
POLYSCOPE_X: true

steps:
- uses: actions/checkout@v5
Expand Down Expand Up @@ -75,7 +80,7 @@ jobs:
token: ${{ secrets.CODECOV_TOKEN }}
flags: ${{ matrix.env.ROBOT_MODEL }}-${{ matrix.env.URSIM_VERSION }}
- name: Generate URSim log files
if: always() && matrix.env.URSIM_VERSION != '10.7.0'
if: always() && matrix.env.POLYSCOPE_X != true
run: |
nc -q 1 192.168.56.101 29999 <<END
saveLog
Expand All @@ -85,21 +90,21 @@ jobs:
docker cp ursim:/ursim/polyscope.log ursim_logs/polyscope.log
docker cp ursim:/ursim/log_history.txt ursim_logs/log_history.txt
- name: Copy flight reports
if: failure() && matrix.env.URSIM_VERSION != '10.7.0'
if: failure() && matrix.env.POLYSCOPE_X != true
run: |
mkdir -p ursim_logs/flightreports
docker cp ursim:/ursim/flightreports/. ursim_logs/flightreports/
- name: Upload logfiles
uses: actions/upload-artifact@v5
if: always() && matrix.env.URSIM_VERSION != '10.7.0'
if: always() && matrix.env.POLYSCOPE_X != true
with:
name: ${{matrix.env.ROBOT_MODEL}}_${{matrix.env.URSIM_VERSION}}_URSim_Logs
path: ursim_logs
if-no-files-found: error
retention-days: 10
- name: Upload test artifacts
uses: actions/upload-artifact@v5
if: always() && matrix.env.URSIM_VERSION != '10.7.0'
if: always() && matrix.env.POLYSCOPE_X != true
with:
name: ${{matrix.env.ROBOT_MODEL}}_${{matrix.env.URSIM_VERSION}}_test_artifacts
path: test_artifacts
Expand Down
2 changes: 1 addition & 1 deletion examples/dashboard_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ int main(int argc, char* argv[])
{
policy = DashboardClient::ClientPolicy::G5;
}
else if (version_information->minor < 11)
else if (version_information->minor < 99)
{
URCL_LOG_ERROR("DashboardClient examples require PolyScope version 10.11.0 or higher. Exiting now.");
return 0;
Expand Down
10 changes: 5 additions & 5 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ if (INTEGRATION_TESTS)
gtest_add_tests(TARGET dashboard_client_g5_tests
)

add_executable(dashboard_client_x_tests test_dashboard_client_x.cpp)
target_link_libraries(dashboard_client_x_tests PRIVATE ur_client_library::urcl GTest::gtest_main)
gtest_add_tests(TARGET dashboard_client_x_tests
)
#add_executable(dashboard_client_x_tests test_dashboard_client_x.cpp)
#target_link_libraries(dashboard_client_x_tests PRIVATE ur_client_library::urcl GTest::gtest_main)
#gtest_add_tests(TARGET dashboard_client_x_tests
#)

# Spline tests
add_executable(spline_tests_urcap test_spline_interpolation.cpp)
Expand Down Expand Up @@ -253,4 +253,4 @@ gtest_add_tests(TARGET control_mode_tests
add_executable(helpers_tests test_helpers.cpp)
target_link_libraries(helpers_tests PRIVATE ur_client_library::urcl GTest::gtest_main)
gtest_add_tests(TARGET helpers_tests
)
)
Loading