Merge pull request #658 from osrf/M1chaelM/fix_wamv_compliance

`generate_wamv.py` should not produce a compliance error on an empty WAMV
osrf · May 25, 2023 · 75e307e · 75e307e
2 parents 158d826 + a147788
commit 75e307e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,21 +3,22 @@ name: Ubuntu CI
 on: [pull_request]
 
 jobs:
-  test-fortress-galactic:
+  test-humble-garden:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     container: 
       image: npslearninglab/watery_robots:humble_current
+      options: --user root
     steps:
       - run: sudo chown -R `whoami`:`whoami` .
       - name: Checkout vrx
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
         with:
             ref: main
             path: vrx
 
       - name: Checkout Gazebosim 
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
         with:
             repository: gazebosim/ros_gz
             ref: humble

diff --git a/vrx_urdf/vrx_gazebo/src/vrx_gazebo/utils.py b/vrx_urdf/vrx_gazebo/src/vrx_gazebo/utils.py
@@ -41,7 +41,7 @@ def create_xacro_file(xacro_target,
         if requested_macros is None:
             xacro_file.write(boiler_plate_bot)
             xacro_file.close()
-            return
+            return True
 
     # Object must be available
     for key, objects in requested_macros.items():