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

Dome version update #262

Merged
merged 11 commits into from
Aug 3, 2020
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
13 changes: 0 additions & 13 deletions .github/ci-bionic/dependencies.yaml

This file was deleted.

16 changes: 16 additions & 0 deletions .github/ci/after_make.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/sh -l

set -x
set -e

# Install (needed for some tests)
make install

# For ign-tools
export IGN_CONFIG_PATH=/usr/local/share/ignition

# For rendering / window tests
Xvfb :1 -screen 0 1280x1024x24 &
export DISPLAY=:1.0
export RENDER_ENGINE_VALUES=ogre2
export MESA_GL_VERSION_OVERRIDE=3.3
36 changes: 36 additions & 0 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
freeglut3-dev
libfreeimage-dev
libglew-dev
libignition-cmake2-dev
libignition-common3-dev
libignition-gui4-dev
libignition-fuel-tools5-dev
libignition-math6-eigen3-dev
libignition-msgs6-dev
libignition-physics3-dev
libignition-plugin-dev
libignition-rendering4-dev
libignition-sensors4-dev
libignition-tools-dev
libignition-transport9-dev
libogre-1.9-dev
libogre-2.1-dev
libprotobuf-dev
libprotoc-dev
libsdformat10-dev
libtinyxml2-dev
libxi-dev
libxmu-dev
qml-module-qt-labs-folderlistmodel
qml-module-qt-labs-settings
qml-module-qtgraphicaleffects
qml-module-qtquick-controls
qml-module-qtquick-controls2
qml-module-qtquick-dialogs
qml-module-qtquick-layouts
qml-module-qtquick2
qtbase5-dev
qtdeclarative5-dev
qtquickcontrols2-5-dev
uuid-dev
xvfb
40 changes: 3 additions & 37 deletions .github/workflows/ci-bionic.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Ubuntu Bionic CI
name: Ubuntu CI

on: [push, pull_request]
on: [push]

jobs:
bionic-ci:
Expand All @@ -9,42 +9,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Bionic CI
- name: Compile and test
id: ci
uses: ignition-tooling/ubuntu-bionic-ci-action@master
with:
apt-dependencies: |
libignition-cmake2-dev
libignition-math6-eigen3-dev
libignition-msgs5-dev
libignition-plugin-dev
libignition-tools-dev
libignition-transport8-dev
libsdformat9-dev
libignition-fuel-tools4-dev
libignition-physics2-dev
libignition-common3-dev
libogre-1.9-dev
libogre-2.1-dev
libglew-dev
libfreeimage-dev
freeglut3-dev
libxmu-dev
libxi-dev
uuid-dev
xvfb
qtbase5-dev
libtinyxml2-dev
libprotoc-dev
libprotobuf-dev
qtdeclarative5-dev
qtquickcontrols2-5-dev
qml-module-qtquick2
qml-module-qtquick-controls
qml-module-qtquick-controls2
qml-module-qtquick-dialogs
qml-module-qtquick-layouts
qml-module-qt-labs-folderlistmodel
qml-module-qt-labs-settings
qml-module-qtgraphicaleffects
codecov-token: ${{ secrets.CODECOV_TOKEN }}
22 changes: 11 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ endif()
# Search for project-specific dependencies
#============================================================================

ign_find_package(sdformat9 VERSION 9.2 REQUIRED)
set(SDF_VER ${sdformat9_VERSION_MAJOR})
ign_find_package(sdformat10 REQUIRED)
set(SDF_VER ${sdformat10_VERSION_MAJOR})

#--------------------------------------
# Find ignition-plugin
Expand All @@ -48,13 +48,13 @@ set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})

#--------------------------------------
# Find ignition-transport
ign_find_package(ignition-transport8 REQUIRED COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})
ign_find_package(ignition-transport9 REQUIRED COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

#--------------------------------------
# Find ignition-msgs
ign_find_package(ignition-msgs5 REQUIRED VERSION 5.3)
set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR})
ign_find_package(ignition-msgs6 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})

#--------------------------------------
# Find ignition-common
Expand All @@ -70,8 +70,8 @@ set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR})

#--------------------------------------
# Find ignition-fuel_tools
ign_find_package(ignition-fuel_tools4 REQUIRED VERSION 4.1)
set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools4_VERSION_MAJOR})
ign_find_package(ignition-fuel_tools5 REQUIRED)
set(IGN_FUEL_TOOLS_VER ${ignition-fuel_tools5_VERSION_MAJOR})

#--------------------------------------
# Find ignition-gui
Expand All @@ -87,13 +87,13 @@ ign_find_package (Qt5

#--------------------------------------
# Find ignition-physics
ign_find_package(ignition-physics2 VERSION 2.1
ign_find_package(ignition-physics3
COMPONENTS
mesh
sdf
REQUIRED
)
set(IGN_PHYSICS_VER ${ignition-physics2_VERSION_MAJOR})
set(IGN_PHYSICS_VER ${ignition-physics3_VERSION_MAJOR})

#--------------------------------------
# Find ignition-sensors
Expand Down Expand Up @@ -130,7 +130,7 @@ ign_find_package(IgnProtobuf
REQUIRED
COMPONENTS all
PRETTY Protobuf)
set(PROTOBUF_IMPORT_DIRS ${ignition-msgs5_INCLUDE_DIRS})
set(PROTOBUF_IMPORT_DIRS ${ignition-msgs6_INCLUDE_DIRS})

# Plugin install dirs
set(IGNITION_GAZEBO_PLUGIN_INSTALL_DIR
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ for dependency installation instructions for each supported operating system.
```

```
sudo apt-get -y install libignition-cmake2-dev libignition-common3-dev libignition-math6-eigen3-dev libignition-plugin-dev libignition-physics2-dev libignition-rendering3-dev libignition-tools-dev libignition-transport8-dev libignition-gui3-dev libignition-msgs5-dev libsdformat9-dev
sudo apt-get -y install libignition-cmake2-dev libignition-common3-dev libignition-math6-eigen3-dev libignition-plugin-dev libignition-physics3-dev libignition-rendering3-dev libignition-tools-dev libignition-transport9-dev libignition-gui4-dev libignition-msgs6-dev libsdformat10-dev
```

### Building from source
Expand Down Expand Up @@ -228,8 +228,8 @@ line is using symbolic links to each library's YAML file.
mkdir ~/.ignition/tools/configs -p
cd ~/.ignition/tools/configs/
ln -s /usr/local/share/ignition/fuel4.yaml .
ln -s /usr/local/share/ignition/transport7.yaml .
ln -s /usr/local/share/ignition/transportlog7.yaml .
ln -s /usr/local/share/ignition/transport9.yaml .
ln -s /usr/local/share/ignition/transportlog9.yaml .
...
export IGN_CONFIG_PATH=$HOME/.ignition/tools/configs
```
Expand Down
2 changes: 1 addition & 1 deletion bitbucket-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pipelines:
libignition-transport8-dev
libsdformat9-dev
libignition-fuel-tools4-dev
libignition-physics2-dev
libignition-physics3-dev
# libignition-common3-dev
# libignition-gui3-dev
# libignition-sensors3-dev
Expand Down
16 changes: 8 additions & 8 deletions docker/Dockerfile.nightly
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ RUN apt-get update \
&& apt-get install -y \
libignition-cmake2-dev \
libignition-common3-dev \
libignition-fuel-tools4-dev \
libignition-fuel-tools5-dev \
libignition-math6-eigen3-dev \
libignition-plugin-dev \
libignition-physics2-dev \
libignition-rendering3-dev \
libignition-physics3-dev \
libignition-rendering4-dev \
libignition-tools-dev \
libignition-transport8-dev \
libignition-gui3-dev \
libignition-msgs5-dev \
libignition-sensors3-dev \
libsdformat9-dev
libignition-transport9-dev \
libignition-gui4-dev \
libignition-msgs6-dev \
libignition-sensors4-dev \
libsdformat10-dev

COPY . ign-gazebo
RUN cd ign-gazebo \
Expand Down
8 changes: 4 additions & 4 deletions examples/standalone/joy_to_twist/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

find_package(ignition-transport8 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})
find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

find_package(sdformat9 REQUIRED)
set(SDF_VER ${sdformat9_VERSION_MAJOR})
find_package(sdformat10 REQUIRED)
set(SDF_VER ${sdformat10_VERSION_MAJOR})

add_executable(joy_to_twist joy_to_twist.cc)
target_link_libraries(joy_to_twist
Expand Down
8 changes: 4 additions & 4 deletions examples/standalone/joystick/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
# joystick currently works only on linux

if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
find_package(ignition-transport8 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})
find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

find_package(sdformat9 REQUIRED)
set(SDF_VER ${sdformat9_VERSION_MAJOR})
find_package(sdformat10 REQUIRED)
set(SDF_VER ${sdformat10_VERSION_MAJOR})

add_executable(joystick joystick.cc)
target_link_libraries(joystick
Expand Down
12 changes: 6 additions & 6 deletions examples/standalone/keyboard/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
find_package(ignition-transport8 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})
find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

find_package(sdformat9 REQUIRED)
set(SDF_VER ${sdformat9_VERSION_MAJOR})
find_package(sdformat10 REQUIRED)
set(SDF_VER ${sdformat10_VERSION_MAJOR})

find_package(ignition-msgs5 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR})
find_package(ignition-msgs6 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})

find_package(ignition-common3 REQUIRED)
set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR})
Expand Down
8 changes: 4 additions & 4 deletions examples/standalone/marker/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
find_package(ignition-transport8 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})
find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

find_package(ignition-common3 REQUIRED)
set(IGN_COMMON_VER ${ignition-common3_VERSION_MAJOR})

find_package(ignition-msgs5 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs5_VERSION_MAJOR})
find_package(ignition-msgs6 REQUIRED)
set(IGN_MSGS_VER ${ignition-msgs6_VERSION_MAJOR})

add_executable(marker marker.cc)
target_link_libraries(marker
Expand Down
4 changes: 2 additions & 2 deletions examples/standalone/scene_requester/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

find_package(ignition-transport8 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport8_VERSION_MAJOR})
find_package(ignition-transport9 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport9_VERSION_MAJOR})

add_executable(scene_requester scene_requester.cc)
target_link_libraries(scene_requester
Expand Down
10 changes: 5 additions & 5 deletions tutorials/migrating_ardupilot_plugin.md
Original file line number Diff line number Diff line change
Expand Up @@ -805,12 +805,12 @@ In the new code we explicitly reference each Ignition package that we use:
# NEW
find_package(sdformat9 REQUIRED)
find_package(ignition-common3-all REQUIRED)
find_package(ignition-gazebo3-all REQUIRED)
find_package(ignition-gazebo4-all REQUIRED)
find_package(ignition-math6-all REQUIRED)
find_package(ignition-msgs5-all REQUIRED)
find_package(ignition-physics2-all REQUIRED)
find_package(ignition-sensors3-all REQUIRED)
find_package(ignition-transport8-all REQUIRED)
find_package(ignition-msgs6-all REQUIRED)
find_package(ignition-physics3-all REQUIRED)
find_package(ignition-sensors4-all REQUIRED)
find_package(ignition-transport9-all REQUIRED)
```

In the old code we need only refer to the build configuration retrieved from the Gazebo package:
Expand Down