From e6dcbc8e8c32814356ec0fc5ffb7750e8a06230c Mon Sep 17 00:00:00 2001 From: Arjo Chakravarty Date: Wed, 28 May 2025 03:33:39 +0000 Subject: [PATCH 1/2] Moves libdwarf, libdw and binutils in as dependencies This is nessecary to get stacktraces properly formatted in our CI when developing. Signed-off-by: Arjo Chakravarty (cherry picked from commit ed0321a7bec1d2bc3580c0bc3f084520a2d7edaf) --- .github/ci/packages.apt | 3 +++ .github/workflows/ci.yml | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index efde86b28b..a275f21320 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -1,5 +1,8 @@ +binutils-dev freeglut3-dev libbenchmark-dev +libdwarf-dev +libdw-dev libfreeimage-dev libglew-dev libgz-cmake4-dev diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b8da0928ca..269e2d79ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,6 @@ jobs: # per bug https://github.com/gazebosim/gz-sim/issues/1409 cmake-args: '-DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOCS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo' codecov-enabled: true - apt-dependencies: libdwarf-dev libdw-dev binutils-dev noble-ci: runs-on: ubuntu-latest @@ -52,4 +51,3 @@ jobs: cmake-args: '-DCMAKE_INSTALL_PREFIX=/usr -DBUILD_DOCS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo' cppcheck-enabled: true cpplint-enabled: true - apt-dependencies: libdwarf-dev libdw-dev binutils-dev From 5107000747d6a8109ace63e491776647d10e6582 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Wed, 4 Jun 2025 13:18:03 +0200 Subject: [PATCH 2/2] Fix bug returning nullptr in a string return type Signed-off-by: Jose Luis Rivero (cherry picked from commit 53c9369b4ae81a453644d3044dfe4d5665d42a7c) --- src/gui/Gui.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/Gui.cc b/src/gui/Gui.cc index 2d6f4549f1..d136fc8f2b 100644 --- a/src/gui/Gui.cc +++ b/src/gui/Gui.cc @@ -206,7 +206,7 @@ std::string defaultGuiConfigFile(bool _isPlayback, { gzerr << "Failed to create the default config folder [" << defaultConfigFolder << "]\n"; - return nullptr; + return ""; } } @@ -217,7 +217,7 @@ std::string defaultGuiConfigFile(bool _isPlayback, gzerr << "Failed to copy installed config [" << installedConfig << "] to default config [" << defaultConfig << "]." << std::endl; - return nullptr; + return ""; } else {