Skip to content

Commit 0f163f7

Browse files
committed
Merge branch 'master' into yarprobotinterface
2 parents 25b59d3 + f11c1c5 commit 0f163f7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
robotology:
4141
- { yarp: yarp-3.8, cmake: 3.16.x }
4242
- { yarp: yarp-3.9, cmake: 3.16.x }
43-
- { yarp: master, cmake: 3.16.x }
43+
- { yarp: master, cmake: 3.19.x }
4444
compiler:
4545
- { cc: gcc, cxx: g++ }
4646
- { cc: clang, cxx: clang++ }
@@ -85,7 +85,7 @@ jobs:
8585
run: sudo apt-get update && sudo apt-get install -qq ccache intltool libxml2-dev libglib2.0-dev libusb-1.0-0-dev libspnav-dev libxwiimote-dev libgtest-dev
8686

8787
- name: Set up CMake
88-
uses: jwlawson/actions-setup-cmake@v1
88+
uses: jwlawson/actions-setup-cmake@v2
8989
with:
9090
cmake-version: ${{matrix.robotology.cmake}}
9191

doc/yarp-devices-install.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Installation from Source Code
22

33
First install the dependencies:
4-
- [Install CMake 3.16+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-cmake.md/)
5-
- [Install YCM 0.11+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-ycm.md/)
6-
- [Install YARP 3.8+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-yarp.md/)
4+
- [Install CMake 3.16+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/docs/install-cmake.md/)
5+
- [Install YCM 0.11+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/docs/install-ycm.md/)
6+
- [Install YARP 3.8+](https://github.com/roboticslab-uc3m/installation-guides/blob/master/docs/install-yarp.md/)
77

8-
For unit testing, you'll need the googletest source package. Refer to [Install googletest](https://github.com/roboticslab-uc3m/installation-guides/blob/master/install-googletest.md/).
8+
For unit testing, you'll need the googletest source package. Refer to [Install googletest](https://github.com/roboticslab-uc3m/installation-guides/blob/master/docs/install-googletest.md/).
99

1010
### Components with known additional/specific dependencies
1111

0 commit comments

Comments
 (0)