From 54e44bf3018767a8d71fe2e0b64536d3e9f4e464 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Mon, 8 Mar 2021 15:11:51 -0800 Subject: [PATCH] Master branch updates Signed-off-by: Louise Poubel --- .github/workflows/ci.yml | 2 +- README.md | 8 ++++---- doc/architecture_design.md | 2 +- examples/standalone/joy_to_twist/README.md | 4 ++-- examples/standalone/joystick/README.md | 2 +- test/integration/examples_build.cc | 2 +- tutorials/distributed_simulation.md | 2 +- tutorials/resources.md | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aea8e80378..cf70ca6852 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v2 - name: Compile and test id: ci - uses: ignition-tooling/action-ignition-ci@master + uses: ignition-tooling/action-ignition-ci@bionic with: codecov-token: ${{ secrets.CODECOV_TOKEN }} # TODO(anyone) Enable Focal CI and fix failing tests diff --git a/README.md b/README.md index da2f91d9cf..ea66cb52eb 100644 --- a/README.md +++ b/README.md @@ -298,7 +298,7 @@ Follow these steps to run tests and static code analysis in your clone of this r make codecheck ``` -See the [Writing Tests section of the contributor guide](https://github.com/ignitionrobotics/ign-gazebo/blob/master/CONTRIBUTING.md#writing-tests) for help creating or modifying tests. +See the [Writing Tests section of the contributor guide](https://github.com/ignitionrobotics/ign-gazebo/blob/main/CONTRIBUTING.md#writing-tests) for help creating or modifying tests. # Folder Structure @@ -330,12 +330,12 @@ ign-gazebo # Contributing Please see -[CONTRIBUTING.md](https://github.com/ignitionrobotics/ign-gazebo/blob/master/CONTRIBUTING.md). +[CONTRIBUTING.md](https://github.com/ignitionrobotics/ign-gazebo/blob/main/CONTRIBUTING.md). # Code of Conduct Please see -[CODE_OF_CONDUCT.md](https://github.com/ignitionrobotics/ign-gazebo/blob/master/CODE_OF_CONDUCT.md). +[CODE_OF_CONDUCT.md](https://github.com/ignitionrobotics/ign-gazebo/blob/main/CODE_OF_CONDUCT.md). # Versioning @@ -343,4 +343,4 @@ This library uses [Semantic Versioning](https://semver.org/). Additionally, this # License -This library is licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). See also the [LICENSE](https://github.com/ignitionrobotics/ign-gazebo/blob/master/LICENSE) file. +This library is licensed under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0). See also the [LICENSE](https://github.com/ignitionrobotics/ign-gazebo/blob/main/LICENSE) file. diff --git a/doc/architecture_design.md b/doc/architecture_design.md index 96e8f6e7be..902e34f370 100644 --- a/doc/architecture_design.md +++ b/doc/architecture_design.md @@ -118,7 +118,7 @@ level and performer is only simulated at one runner at a time. It would be convenient to be able to specify standalone programs in the SDF file so they're loaded at the same time as the simulation. For example, Gazebo's -[JoyPlugin](https://github.com/osrf/gazebo/blob/master/plugins/JoyPlugin.hh) +[JoyPlugin](https://github.com/osrf/gazebo/blob/gazebo11/plugins/JoyPlugin.hh) is a `WorldPlugin`, but it doesn't need to access any world API, or to run in the physics thread, or even to run in the gzserver process. However, it was implemented as a plugin because that makes it easier to specify in diff --git a/examples/standalone/joy_to_twist/README.md b/examples/standalone/joy_to_twist/README.md index 9579b6226a..fe7b7d8e85 100644 --- a/examples/standalone/joy_to_twist/README.md +++ b/examples/standalone/joy_to_twist/README.md @@ -1,9 +1,9 @@ # Joy to Twist Standalone program that subscribes to -[ignition::msgs::Joy](https://github.com/ignitionrobotics/ign-msgs/blob/master/proto/ignition/msgs/joy.proto) +[ignition::msgs::Joy](https://ignitionrobotics.org/api/msgs/5.6/classignition_1_1msgs_1_1Joy.html) messages and converts publishes -[ignition::msgs::Twist](https://github.com/ignitionrobotics/ign-msgs/blob/master/proto/ignition/msgs/twist.proto) +[ignition::msgs::Twist](https://ignitionrobotics.org/api/msgs/5.6/classignition_1_1msgs_1_1Twist.html) messages according to user-defined configuration. ## Build diff --git a/examples/standalone/joystick/README.md b/examples/standalone/joystick/README.md index 882c9b1b3d..1b965b40e8 100644 --- a/examples/standalone/joystick/README.md +++ b/examples/standalone/joystick/README.md @@ -1,7 +1,7 @@ # Joystick Standalone program that publishes -[ignition::msgs::Joy](https://github.com/ignitionrobotics/ign-msgs/blob/master/proto/ignition/msgs/joy.proto) +[ignition::msgs::Joy](https://ignitionrobotics.org/api/msgs/5.6/classignition_1_1msgs_1_1Joy.html) messages from a joystick device using Ignition Transport. The mapping of joystick buttons to fields in the message is the same as [this](http://wiki.ros.org/joy). diff --git a/test/integration/examples_build.cc b/test/integration/examples_build.cc index c76e92e689..95b1d75b63 100644 --- a/test/integration/examples_build.cc +++ b/test/integration/examples_build.cc @@ -25,7 +25,7 @@ #include "ignition/gazebo/test_config.hh" // File copied from -// https://github.com/ignitionrobotics/ign-gui/raw/master/test/integration/ExamplesBuild_TEST.cc +// https://github.com/ignitionrobotics/ign-gui/raw/ign-gui3/test/integration/ExamplesBuild_TEST.cc using namespace ignition; diff --git a/tutorials/distributed_simulation.md b/tutorials/distributed_simulation.md index af73bb09d1..168f40ee78 100644 --- a/tutorials/distributed_simulation.md +++ b/tutorials/distributed_simulation.md @@ -125,7 +125,7 @@ keeps all performers loaded, but performs no physics simulation. Stepping happens in 2 stages: the primary update and the secondaries update, according to the diagram below: - + 1. The primary publishes a `SimulationStep` message on the `/step` topic, containing: diff --git a/tutorials/resources.md b/tutorials/resources.md index 5de32c97a9..b186cda0a9 100644 --- a/tutorials/resources.md +++ b/tutorials/resources.md @@ -40,7 +40,7 @@ Ignition will look for system plugins on the following paths, in order: 1. All paths on the `IGN_GAZEBO_SYSTEM_PLUGIN_PATH` environment variable 2. `$HOME/.ignition/gazebo/plugins` -3. [Systems that are installed with Ignition Gazebo](https://github.com/ignitionrobotics/ign-gazebo/blob/master/src/systems/) +3. [Systems that are installed with Ignition Gazebo](https://ignitionrobotics.org/api/gazebo/3.7/namespaceignition_1_1gazebo_1_1systems.html) ### Ignition GUI plugins @@ -59,7 +59,7 @@ GUI plugins may be loaded through: Ignition will look for GUI plugins on the following paths, in order: 1. All paths set on the `IGN_GUI_PLUGIN_PATH` environment variable -2. [GUI plugins that are installed with Ignition Gazebo](https://github.com/ignitionrobotics/ign-gazebo/tree/master/src/gui/plugins) +2. [GUI plugins that are installed with Ignition Gazebo](https://github.com/ignitionrobotics/ign-gazebo/tree/ign-gazebo3/src/gui/plugins) 3. Other paths added by calling `ignition::gui::App()->AddPluginPath` 4. `~/.ignition/gui/plugins` 5. [Plugins which are installed with Ignition GUI](https://ignitionrobotics.org/api/gui/3.0/namespaceignition_1_1gui_1_1plugins.html)