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

Bumps in jetty : ci_matching_branch/bump_jetty_gz-launch9 #285

Merged
merged 2 commits into from
Jan 23, 2025
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
4 changes: 2 additions & 2 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ binutils-dev
libgflags-dev
libgz-cmake4-dev
libgz-common6-dev
libgz-sim9-dev
libgz-gui9-dev
libgz-sim10-dev
libgz-gui10-dev
libgz-math8-dev
libgz-math8-eigen3-dev
libgz-msgs11-dev
Expand Down
13 changes: 0 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,6 @@ on:
- 'main'

jobs:
jammy-ci:
runs-on: ubuntu-latest
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@jammy
with:
codecov-enabled: true
cppcheck-enabled: true
cpplint-enabled: true
noble-ci:
runs-on: ubuntu-latest
name: Ubuntu Noble CI
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})

#--------------------------------------
# Find gz-gui
gz_find_package(gz-gui9 REQUIRED)
set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
gz_find_package(gz-gui10 REQUIRED)
set(GZ_GUI_VER ${gz-gui10_VERSION_MAJOR})
gz_find_package (Qt5
COMPONENTS
Core
Expand All @@ -88,8 +88,8 @@ gz_find_package (Qt5

#--------------------------------------
# Find gz-sim
gz_find_package(gz-sim9 REQUIRED PRIVATE COMPONENTS gui)
set(GZ_SIM_VER ${gz-sim9_VERSION_MAJOR})
gz_find_package(gz-sim10 REQUIRED PRIVATE COMPONENTS gui)
set(GZ_SIM_VER ${gz-sim10_VERSION_MAJOR})

gz_pkg_check_modules(websockets libwebsockets)
if (NOT websockets_FOUND)
Expand Down
4 changes: 2 additions & 2 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
<depend>binutils</depend>
<depend>gz-cmake4</depend>
<depend>gz-common6</depend>
<depend>gz-gui9</depend>
<depend>gz-gui10</depend>
<depend>gz-math8</depend>
<depend>gz-msgs11</depend>
<depend>gz-plugin3</depend>
<depend>gz-sim9</depend>
<depend>gz-sim10</depend>
<depend>gz-tools2</depend>
<depend>gz-transport14</depend>
<depend>libgflags-dev</depend>
Expand Down
2 changes: 1 addition & 1 deletion tutorials/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ necessary prerequisites followed by building from source.
sudo sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list'
wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -
sudo apt-get update
sudo apt-get -y install libgz-cmake4-dev libgz-sim9-dev
sudo apt-get -y install libgz-cmake4-dev libgz-sim10-dev
```

### Building from source
Expand Down
6 changes: 3 additions & 3 deletions tutorials/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Every script starts with these two tags, which specify the `xml` version and `gz

We can run multiple commands from one file.

Take a look at the [sim.gzlaunch](https://github.com/gazebosim/gz-launch/blob/gz-launch8/examples/sim.gzlaunch) launch file. This script runs the Gazebo `server` and Gazebo `client`. We need to just write the command in the `command` tag.
Take a look at the [sim.gzlaunch](https://github.com/gazebosim/gz-launch/blob/gz-launch9/examples/sim.gzlaunch) launch file. This script runs the Gazebo `server` and Gazebo `client`. We need to just write the command in the `command` tag.

```xml
<executable name='sim-server'>
Expand All @@ -36,11 +36,11 @@ Take a look at the [sim.gzlaunch](https://github.com/gazebosim/gz-launch/blob/gz

## Spawn a robot into simulation with plugins

Now take a look at the [factory.gzlaunch](https://github.com/gazebosim/gz-launch/blob/gz-launch8/examples/factory.gzlaunch) launch file. We defined a `SimFactory` plugin under which we included an `X2 UGV` robot and added the `DiffDrive` plugin to control the robot. We also added the `StatePublisher` plugin which publishes the robot state information.
Now take a look at the [factory.gzlaunch](https://github.com/gazebosim/gz-launch/blob/gz-launch9/examples/factory.gzlaunch) launch file. We defined a `SimFactory` plugin under which we included an `X2 UGV` robot and added the `DiffDrive` plugin to control the robot. We also added the `StatePublisher` plugin which publishes the robot state information.

## Launch simulation with plugins in separate processes

The [sim_plugins.gzlaunch](https://github.com/gazebosim/gz-launch/blob/gz-launch8/examples/sim_plugins.gzlaunch) launch file loads some plugins
The [sim_plugins.gzlaunch](https://github.com/gazebosim/gz-launch/blob/gz-launch9/examples/sim_plugins.gzlaunch) launch file loads some plugins
and also starts simulation. The `joystick` plugin will be launched in its own process
and will read from a joystick device and output data onto a topic. The `JoyToTwist`
plugin also launches into a separate process and transforms a `joystick` message to a
Expand Down
Loading