Skip to content

Commit

Permalink
Merge branch 'master' into addAngAccLinVelSensor
Browse files Browse the repository at this point in the history
  • Loading branch information
nicktrem committed Nov 16, 2024
2 parents fa95a8c + dde7dcb commit f2176d2
Show file tree
Hide file tree
Showing 2,312 changed files with 65,271 additions and 109,295 deletions.
2 changes: 1 addition & 1 deletion .ci/initial-cache.gh.linux.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ set(ENABLE_yarpcar_portmonitor ON CACHE BOOL "")
set(ENABLE_yarppm_depthimage_to_mono ON CACHE BOOL "")
set(ENABLE_yarppm_depthimage_to_rgb ON CACHE BOOL "")
set(ENABLE_yarppm_segmentationimage_to_rgb ON CACHE BOOL "")
set(ENABLE_yarpcar_h264 ON CACHE BOOL "" ON CACHE BOOL "")
set(ENABLE_yarpcar_gstreamer ON CACHE BOOL "" ON CACHE BOOL "")
set(ENABLE_yarpcar_unix_stream ON CACHE BOOL "")
set(ENABLE_yarppm_image_compression_ffmpeg ON CACHE BOOL "")
set(ENABLE_yarppm_sound_compression_mp3 ON CACHE BOOL "")
Expand Down
1 change: 0 additions & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
/src/libYARP_run/** @drdanz
/src/libYARP_serversql/** @drdanz
/src/libYARP_sig/** @drdanz
/src/libYARP_wire_rep_utils/** @drdanz
/src/portmonitors/depthimage_compression_zfp/** @Nicogene
/src/portmonitors/depthimage_to_mono/** @randaz81
/src/portmonitors/depthimage_to_rgb/** @randaz81
Expand Down
51 changes: 24 additions & 27 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,16 +170,6 @@ jobs:
fail-fast: false
matrix:
config:
- {
cmake_version: "3.17.*",
cmake_generator: "Unix Makefiles",
ycm_version: "0.15.3",
}
- {
cmake_version: "3.18.*",
cmake_generator: "Unix Makefiles",
ycm_version: "0.15.3",
}
- {
cmake_version: "3.19.*",
cmake_generator: "Unix Makefiles",
Expand Down Expand Up @@ -825,15 +815,20 @@ jobs:
run: |
# Temporary workaround for https://github.com/actions/setup-python/issues/577
rm -f /usr/local/bin/2to3
rm -f /usr/local/bin/idle3
rm -f /usr/local/bin/pydoc3
rm -f /usr/local/bin/python3
rm -f /usr/local/bin/python3-config
rm -f /usr/local/bin/2to3-3.11
rm -f /usr/local/bin/2to3-3.12
rm -f /usr/local/bin/idle3
rm -f /usr/local/bin/idle3.11
rm -f /usr/local/bin/idle3.12
rm -f /usr/local/bin/pydoc3
rm -f /usr/local/bin/pydoc3.11
rm -f /usr/local/bin/pydoc3.12
rm -f /usr/local/bin/python3
rm -f /usr/local/bin/python3.11
rm -f /usr/local/bin/python3.12
rm -f /usr/local/bin/python3-config
rm -f /usr/local/bin/python3.11-config
rm -f /usr/local/bin/python3.12-config
wget -nv https://github.com/robotology/ycm/releases/download/v0.15.3/ycm-cmake-modules-0.15.3-all.tar.gz -O /Users/runner/work/yarp/ycm.tar.gz
7z x /Users/runner/work/yarp/ycm.tar.gz -o/Users/runner/work/yarp
Expand All @@ -848,7 +843,7 @@ jobs:
id: prepare_environment_script
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
set(_env_script ${CMAKE_CURRENT_LIST_DIR}/environment_script.cmake)
file(WRITE "${_env_script}" "")
Expand Down Expand Up @@ -963,14 +958,14 @@ jobs:
- name: Print Environment Script
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
file(READ "${{ steps.prepare_environment_script.outputs.environment_script }}" _out)
message("${_out}")
- name: Print system information
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
set(_which_cmd which)
Expand Down Expand Up @@ -1048,7 +1043,7 @@ jobs:
- name: Configure
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
set(_generator)
Expand Down Expand Up @@ -1118,7 +1113,7 @@ jobs:
- name: Build
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
execute_process_x(
Expand All @@ -1140,7 +1135,7 @@ jobs:
- name: Run tests
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
execute_process_x(
Expand All @@ -1160,7 +1155,7 @@ jobs:
- name: Status Check
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
execute_process_x(
Expand Down Expand Up @@ -1188,7 +1183,7 @@ jobs:
- name: Test installation
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
execute_process_x(
Expand All @@ -1206,7 +1201,7 @@ jobs:
if: matrix.config.test_external_bindings
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
### FIXME Can we avoid this duplication?
Expand Down Expand Up @@ -1282,7 +1277,7 @@ jobs:
if: matrix.config.test_external_bindings
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
### FIXME Can we avoid this duplication?
Expand Down Expand Up @@ -1357,7 +1352,7 @@ jobs:
- name: Compress installation files
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
execute_process_x(
Expand All @@ -1375,7 +1370,7 @@ jobs:
- name: Cleanup
shell: cmake -P {0}
run: |
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
include(${{ steps.prepare_environment_script.outputs.environment_script }})
# Reset ccache stats before uploading
Expand Down Expand Up @@ -1980,7 +1975,8 @@ jobs:
- name: Capture coverage info
run: |
(cd build && gcovr --sonarqube --branches --output coverage.xml --root .. .)
(cd build && \
gcovr --exclude="../extern/*" --sonarqube --branches --output coverage.xml --root .. .)
- name: Print coverage info file
run: |
Expand Down Expand Up @@ -2034,6 +2030,7 @@ jobs:
-Dsonar.junit.reportPaths=build/JUnitTestResults.xml \
-Dsonar.exclusions="src/yarp*/**/* src/carriers/**/* src/devices/**/* src/idls/**/* src/libyarp*/**/* src/robottestingframework-plugins/**/* tests/**/*" \
-Dsonar.coverage.exclusions="\
src/libYARP_dev/src/yarp/dev/tests/*,\
src/devices/*/tests/*,\
src/carriers/*/tests/*,\
src/portmonitors/*/tests/*,\
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Nightly Merge
uses: robotology/gh-action-nightly-merge@v1.3.3
with:
stable_branch: 'master'
stable_branch: 'yarp-3.10'
development_branch: 'master'
allow_ff: false
user_name: 'robotology-bot'
Expand Down
Loading

0 comments on commit f2176d2

Please sign in to comment.