diff --git a/.github/ci-bionic/dependencies.yaml b/.github/ci-bionic/dependencies.yaml deleted file mode 100644 index f85b9cf56c..0000000000 --- a/.github/ci-bionic/dependencies.yaml +++ /dev/null @@ -1,13 +0,0 @@ -repositories: - ign-rendering: - type: git - url: https://github.com/ignitionrobotics/ign-rendering - version: master - ign-gui: - type: git - url: https://github.com/ignitionrobotics/ign-gui - version: master - ign-sensors: - type: git - url: https://github.com/ignitionrobotics/ign-sensors - version: master diff --git a/.github/ci/after_make.sh b/.github/ci/after_make.sh new file mode 100644 index 0000000000..eb81ef7985 --- /dev/null +++ b/.github/ci/after_make.sh @@ -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 diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt new file mode 100644 index 0000000000..6b824eb4f1 --- /dev/null +++ b/.github/ci/packages.apt @@ -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 diff --git a/.github/workflows/ci-bionic.yml b/.github/workflows/ci-bionic.yml index 3b3229190e..c708c1325e 100644 --- a/.github/workflows/ci-bionic.yml +++ b/.github/workflows/ci-bionic.yml @@ -1,6 +1,6 @@ -name: Ubuntu Bionic CI +name: Ubuntu CI -on: [push, pull_request] +on: [push] jobs: bionic-ci: @@ -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 }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b45237235..94b7b7dfab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/README.md b/README.md index 760685039a..d7508cfbf8 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 ``` diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 4c3e8563a4..1e85154391 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -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 diff --git a/docker/Dockerfile.nightly b/docker/Dockerfile.nightly index 7ef7b15012..6f4d6a7e6b 100644 --- a/docker/Dockerfile.nightly +++ b/docker/Dockerfile.nightly @@ -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 \ diff --git a/examples/standalone/joy_to_twist/CMakeLists.txt b/examples/standalone/joy_to_twist/CMakeLists.txt index cd91c38192..a370bc286d 100644 --- a/examples/standalone/joy_to_twist/CMakeLists.txt +++ b/examples/standalone/joy_to_twist/CMakeLists.txt @@ -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 diff --git a/examples/standalone/joystick/CMakeLists.txt b/examples/standalone/joystick/CMakeLists.txt index f096611a9c..a65f071cec 100644 --- a/examples/standalone/joystick/CMakeLists.txt +++ b/examples/standalone/joystick/CMakeLists.txt @@ -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 diff --git a/examples/standalone/keyboard/CMakeLists.txt b/examples/standalone/keyboard/CMakeLists.txt index 900346334b..34e5f6fc22 100644 --- a/examples/standalone/keyboard/CMakeLists.txt +++ b/examples/standalone/keyboard/CMakeLists.txt @@ -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}) diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt index f220f57e44..931d976ac9 100644 --- a/examples/standalone/marker/CMakeLists.txt +++ b/examples/standalone/marker/CMakeLists.txt @@ -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 diff --git a/examples/standalone/scene_requester/CMakeLists.txt b/examples/standalone/scene_requester/CMakeLists.txt index 67cf7dba42..bdd24b6898 100644 --- a/examples/standalone/scene_requester/CMakeLists.txt +++ b/examples/standalone/scene_requester/CMakeLists.txt @@ -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 diff --git a/tutorials/migrating_ardupilot_plugin.md b/tutorials/migrating_ardupilot_plugin.md index 8399009416..c4cbb074f6 100644 --- a/tutorials/migrating_ardupilot_plugin.md +++ b/tutorials/migrating_ardupilot_plugin.md @@ -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: