Skip to content

Commit

Permalink
Merge pull request #39 from robotology/traversaro-patch-1
Browse files Browse the repository at this point in the history
Add irrlicht, update vcpkg and install ignition libraries via vcpkg
  • Loading branch information
traversaro authored Jan 22, 2021
2 parents f8e2a58 + 2666dfd commit 590e239
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 33 deletions.
15 changes: 11 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
cd C:/robotology
git clone https://github.com/Microsoft/vcpkg
cd vcpkg
git checkout ac2ddd5f059b56b6e0b9fc0c73bd4feccad539ff
git checkout 45fc55825db2a5bcaffccff1e6afadc519d164ea
C:/robotology/vcpkg/bootstrap-vcpkg.sh
git clone https://github.com/robotology/robotology-vcpkg-ports C:/robotology/robotology-vcpkg-ports
cd C:/robotology/robotology-vcpkg-ports
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
- name: Install vcpkg ports
shell: bash
run: |
C:/robotology/vcpkg/vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports --overlay-ports=${GITHUB_WORKSPACE}/custom-ports install --triplet x64-windows asio boost-asio boost-bind boost-process boost-dll boost-filesystem boost-system freeglut esdcan-binary glew glfw3 ode openssl libxml2 matio ipopt-binary cppad
C:/robotology/vcpkg/vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports --overlay-ports=${GITHUB_WORKSPACE}/custom-ports install --triplet x64-windows asio boost-asio boost-bind boost-process boost-dll boost-filesystem boost-system freeglut esdcan-binary glew glfw3 ode openssl libxml2 matio ipopt-binary cppad irrlicht
C:/robotology/vcpkg/vcpkg.exe list
# Remove temporary files https://github.com/Microsoft/vcpkg/blob/master/docs/about/faq.md#how-can-i-remove-temporary-files
Expand Down Expand Up @@ -179,8 +179,8 @@ jobs:
- name: Install vcpkg ports
shell: bash
run: |
# Install dependencies for gazebo11 and related ignition dependencies (listed in https://github.com/ignition-tooling/gazebodistro/blob/master/gazebo11.yaml)
C:/robotology/vcpkg/vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports --overlay-ports=${GITHUB_WORKSPACE}/custom-ports install --triplet x64-windows boost-asio boost-any boost-date-time boost-filesystem boost-format boost-interprocess boost-iostreams boost-program-options boost-property-tree boost-regex boost-smart-ptr boost-system boost-thread boost-variant boost-uuid bullet3 cppzmq curl dlfcn-win32 freeimage gts libyaml libzip jsoncpp ogre protobuf qt5-base qwt sqlite3[core,tool] tbb tinyxml2 urdfdom zeromq
# Install dependencies for gazebo11
C:/robotology/vcpkg/vcpkg.exe --overlay-ports=C:/robotology/robotology-vcpkg-ports --overlay-ports=${GITHUB_WORKSPACE}/custom-ports install --triplet x64-windows boost-asio boost-any boost-date-time boost-filesystem boost-format boost-interprocess boost-iostreams boost-program-options boost-property-tree boost-regex boost-smart-ptr boost-system boost-thread boost-variant boost-uuid bullet3 cppzmq curl dlfcn-win32 freeimage gts libyaml libzip jsoncpp ogre[core,assimp,freeimage,overlay,zziplib] protobuf qt5-base qwt sqlite3[core,tool] tbb tinyxml2 urdfdom zeromq ignition-cmake2 ignition-common3 ignition-fuel-tools4 ignition-math6 ignition-msgs5 ignition-transport8 sdformat9
C:/robotology/vcpkg/vcpkg.exe list
# Remove temporary files https://github.com/Microsoft/vcpkg/blob/master/docs/about/faq.md#how-can-i-remove-temporary-files
Expand Down Expand Up @@ -242,6 +242,13 @@ jobs:
cd C:/robotology/gazebo
colcon build --merge-install --cmake-args -G "Visual Studio 16 2019" -A x64 -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=C:/robotology/vcpkg/scripts/buildsystems/vcpkg.cmake -DBUILD_TESTING:BOOL=OFF
- name: Upload logs on failures
if: ${{ failure() }}
uses: actions/upload-artifact@v1
with:
name: gazebo-colcon-logs
path: C:/robotology/gazebo/log

# Remove temporary files
- name: Cleanup vcpkg temporary directories
shell: cmd
Expand Down
30 changes: 1 addition & 29 deletions gazebo-repos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,4 @@ repositories:
gazebo:
type: git
url: https://github.com/osrf/gazebo
version: gazebo11_11.2.0
ign-cmake:
type: git
url: https://github.com/ignitionrobotics/ign-cmake
version: ignition-cmake2_2.5.0
ign-common:
type: git
url: https://github.com/ignitionrobotics/ign-common
version: ignition-common3_3.6.1
ign-fuel-tools:
type: git
url: https://github.com/ignitionrobotics/ign-fuel-tools
version: ignition-fuel-tools4_4.2.1
ign-math:
type: git
url: https://github.com/ignitionrobotics/ign-math
version: ignition-math6_6.6.0
ign-msgs:
type: git
url: https://github.com/ignitionrobotics/ign-msgs
version: ignition-msgs5_5.3.0
ign-transport:
type: git
url: https://github.com/ignitionrobotics/ign-transport
version: ignition-transport8_8.1.0
sdformat:
type: git
url: https://github.com/osrf/sdformat
version: sdformat9_9.3.0
version: 0d1642979382d95ae5a120fdccaeb7ad4c51cf36

0 comments on commit 590e239

Please sign in to comment.