Skip to content

Commit

Permalink
5 ➡️ 6 (main) (#155)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
  • Loading branch information
chapulina authored Apr 21, 2022
2 parents b662933 + 50ed180 commit 8b2b569
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/ci/packages.apt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ libwebsockets-dev
libxi-dev
libxmu-dev
libyaml-dev
python-yaml
python3-yaml
uuid-dev
xvfb
9 changes: 9 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,12 @@ jobs:
codecov-enabled: true
cppcheck-enabled: true
cpplint-enabled: true
jammy-ci:
runs-on: ubuntu-latest
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Compile and test
id: ci
uses: ignition-tooling/action-ignition-ci@jammy
10 changes: 10 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@

### Ignition Launch 5.X.X (20XX-XX-XX)

### Ignition Launch 5.1.0 (2022-03-21)
1. Use exec instead of popen to run ign-launch binary
* [Pull request #151](https://github.com/ignitionrobotics/ign-launch/pull/151)

1. Expose headless_rendering sdf tag
* [Pull request #148](https://github.com/ignitionrobotics/ign-launch/pull/148)

1. Remove spammy CMake message
* [Pull request #142](https://github.com/ignitionrobotics/ign-launch/pull/142)

### Ignition Launch 5.0.0 (2021-10-01)

1. Port ign-launch to Windows
Expand Down
9 changes: 9 additions & 0 deletions plugins/gazebo_server/GazeboServer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,15 @@ bool GazeboServer::Load(const tinyxml2::XMLElement *_elem)
serverConfig.AddPlugin({entityName, entityType, file, name, sdf});
}

// Set headless rendering
elem = _elem->FirstChildElement("headless_rendering");
if (elem)
{
std::string str = elem->GetText();
serverConfig.SetHeadlessRendering(str == "1" ||
common::lowercase(str) == "true");
}

// Create and run the simulation server
this->server.reset(new gazebo::Server(serverConfig));
this->server->Run(false, 0, !run);
Expand Down
14 changes: 1 addition & 13 deletions src/cmd/cmdlaunch.rb.in
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

require 'open3'

# Constants.
LIBRARY_VERSION = '@PROJECT_VERSION_FULL@'
COMMANDS = {
Expand Down Expand Up @@ -50,16 +48,6 @@ class Cmd
end

# Drop command from list of arguments
Open3.popen2e(exe_name, *args[1..-1]) do |_in, out_err, wait_thr|
begin
out_err.each do |line|
print line
end
exit(wait_thr.value.exitstatus)
rescue Interrupt => e
print e.message
exit(-1)
end
end
exec(exe_name, *args[1..-1])
end
end

0 comments on commit 8b2b569

Please sign in to comment.