From 076f4d1682d321df6db37e394fcf62b6f93615ab Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 18 Mar 2024 18:03:03 -0500 Subject: [PATCH 1/4] Add package.xml and remove dependency on python3-yaml Signed-off-by: Addisu Z. Taddese --- .github/ci/packages.apt | 1 - .github/workflows/package_xml.yml | 20 +++++++++++++++ package.xml | 42 +++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) 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..5b5c6d88 --- /dev/null +++ b/.github/workflows/package_xml.yml @@ -0,0 +1,20 @@ +name: Validate package.xml + +on: + pull_request: + +jobs: + package-xml: + runs-on: ubuntu-latest + name: package.xml and CMake versions match + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Check versions + run: | + echo "Extract version numbers and compare" + package_xml_version=$(sed -nE 's/\s*([0-9.]*)<\/version>\s*/\1/p' package.xml) + echo "Version in package.xml: ${package_xml_version}" + cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt) + echo "Version in CMake: ${cmake_version}" + [ $package_xml_version = $cmake_version ] diff --git a/package.xml b/package.xml new file mode 100644 index 00000000..d90d6b58 --- /dev/null +++ b/package.xml @@ -0,0 +1,42 @@ + + + + gz-launch7 + 7.0.0 + Gazebo Launch : Run and manage programs and plugins + Nate Koenig + Apache License 2.0 + https://github.com/gazebosim/gz-launch + + cmake + + binutils + gz-cmake3 + gz-common5 + gz-fuel-tools9 + gz-gui8 + gz-math7 + gz-msgs10 + gz-physics7 + gz-plugin2 + gz-rendering8 + gz-sensors8 + gz-sim8 + gz-tools2 + gz-transport13 + libgflags-dev + libwebsockets-dev + libxi-dev + libxmu-dev + libyaml-dev + sdformat14 + tinyxml2 + uuid + + xvfb + + + cmake + + + From 100f21e6e6b5280b029ebb7bb859c6c9e250efd1 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 11 Apr 2024 12:55:33 -0500 Subject: [PATCH 2/4] Update version Signed-off-by: Addisu Z. Taddese --- .github/workflows/package_xml.yml | 13 ++----------- package.xml | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.github/workflows/package_xml.yml b/.github/workflows/package_xml.yml index 5b5c6d88..4bd4a9aa 100644 --- a/.github/workflows/package_xml.yml +++ b/.github/workflows/package_xml.yml @@ -6,15 +6,6 @@ on: jobs: package-xml: runs-on: ubuntu-latest - name: package.xml and CMake versions match + name: Validate package.xml steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Check versions - run: | - echo "Extract version numbers and compare" - package_xml_version=$(sed -nE 's/\s*([0-9.]*)<\/version>\s*/\1/p' package.xml) - echo "Version in package.xml: ${package_xml_version}" - cmake_version=$(sed -nE 's/^project.*VERSION\s*([0-9.]*).*/\1/p' CMakeLists.txt) - echo "Version in CMake: ${cmake_version}" - [ $package_xml_version = $cmake_version ] + - uses: gazebo-tooling/action-gz-ci/validate_package_xml@jammy diff --git a/package.xml b/package.xml index d90d6b58..bb45074e 100644 --- a/package.xml +++ b/package.xml @@ -2,7 +2,7 @@ gz-launch7 - 7.0.0 + 7.1.0 Gazebo Launch : Run and manage programs and plugins Nate Koenig Apache License 2.0 From 102734c670d109374601fc97ca21e6b2e0a51e5b Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 25 Apr 2024 17:11:14 -0500 Subject: [PATCH 3/4] Disable tests on windows because the timeout Signed-off-by: Addisu Z. Taddese --- src/Manager_TEST.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Manager_TEST.cc b/src/Manager_TEST.cc index 0a8ed9ba..ef6af19c 100644 --- a/src/Manager_TEST.cc +++ b/src/Manager_TEST.cc @@ -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 From 3d73c966cd6be20a15199c13affdf6e583caa002 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Thu, 25 Apr 2024 22:39:20 -0500 Subject: [PATCH 4/4] Disable one more test on windows Signed-off-by: Addisu Z. Taddese --- src/Manager_TEST.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Manager_TEST.cc b/src/Manager_TEST.cc index ef6af19c..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;