From 6459072643c2c37fc37afaf99c574e5411306ede Mon Sep 17 00:00:00 2001
From: "Addisu Z. Taddese" <addisu@openrobotics.org>
Date: Tue, 30 Apr 2024 21:32:27 -0500
Subject: [PATCH] Add package.xml, remove dependency on python3-yaml, and
 disable failing windows tests (#249)

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
---
 .github/ci/packages.apt           |  1 -
 .github/workflows/package_xml.yml | 11 ++++++++
 package.xml                       | 42 +++++++++++++++++++++++++++++++
 src/Manager_TEST.cc               |  6 ++---
 4 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/package_xml.yml
 create mode 100644 package.xml

diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
index 4edbd19d..8ea6d0b6 100644
--- a/.github/ci/packages.apt
+++ b/.github/ci/packages.apt
@@ -20,6 +20,5 @@ libwebsockets-dev
 libxi-dev
 libxmu-dev
 libyaml-dev
-python3-yaml
 uuid-dev
 xvfb
diff --git a/.github/workflows/package_xml.yml b/.github/workflows/package_xml.yml
new file mode 100644
index 00000000..4bd4a9aa
--- /dev/null
+++ b/.github/workflows/package_xml.yml
@@ -0,0 +1,11 @@
+name: Validate package.xml
+
+on:
+  pull_request:
+
+jobs:
+  package-xml:
+    runs-on: ubuntu-latest
+    name: Validate package.xml
+    steps:
+      - uses: gazebo-tooling/action-gz-ci/validate_package_xml@jammy
diff --git a/package.xml b/package.xml
new file mode 100644
index 00000000..bb45074e
--- /dev/null
+++ b/package.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="2">
+  <name>gz-launch7</name>
+  <version>7.1.0</version>
+  <description>Gazebo Launch : Run and manage programs and plugins</description>
+  <maintainer email="natekoenig@gmail.com">Nate Koenig</maintainer>
+  <license>Apache License 2.0</license>
+  <url type="website">https://github.com/gazebosim/gz-launch</url>
+
+  <buildtool_depend>cmake</buildtool_depend>
+
+  <depend>binutils</depend>
+  <depend>gz-cmake3</depend>
+  <depend>gz-common5</depend>
+  <depend>gz-fuel-tools9</depend>
+  <depend>gz-gui8</depend>
+  <depend>gz-math7</depend>
+  <depend>gz-msgs10</depend>
+  <depend>gz-physics7</depend>
+  <depend>gz-plugin2</depend>
+  <depend>gz-rendering8</depend>
+  <depend>gz-sensors8</depend>
+  <depend>gz-sim8</depend>
+  <depend>gz-tools2</depend>
+  <depend>gz-transport13</depend>
+  <depend>libgflags-dev</depend>
+  <depend>libwebsockets-dev</depend>
+  <depend>libxi-dev</depend>
+  <depend>libxmu-dev</depend>
+  <depend>libyaml-dev</depend>
+  <depend>sdformat14</depend>
+  <depend>tinyxml2</depend>
+  <depend>uuid</depend>
+
+  <test_depend>xvfb</test_depend>
+
+  <export>
+    <build_type>cmake</build_type>
+  </export>
+</package>
+
diff --git a/src/Manager_TEST.cc b/src/Manager_TEST.cc
index 0a8ed9ba..d50ba964 100644
--- a/src/Manager_TEST.cc
+++ b/src/Manager_TEST.cc
@@ -112,7 +112,7 @@ TEST_F(ManagerTest, RunBadXml)
 }
 
 /////////////////////////////////////////////////
-TEST_F(ManagerTest, RunLs)
+TEST_F(ManagerTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(RunLs))
 {
   std::string cmd;
 
@@ -137,7 +137,7 @@ TEST_F(ManagerTest, RunLs)
 }
 
 /////////////////////////////////////////////////
-TEST_F(ManagerTest, RunEnvPre)
+TEST_F(ManagerTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(RunEnvPre))
 {
   // Test that environment is applied regardless of order
   #ifndef _WIN32
@@ -175,7 +175,7 @@ TEST_F(ManagerTest, RunEnvPre)
 }
 
 /////////////////////////////////////////////////
-TEST_F(ManagerTest, RunEnvPost)
+TEST_F(ManagerTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(RunEnvPost))
 {
   // Test that environment is applied regardless of order
   #ifndef _WIN32