Remove non-header files from include folder (backport #716) (#754)

* Remove non-header files from include folder (#716) The `include` directory previously contained all files copied over, but only `*.h` and `*.hpp` files are required. This commit removes all files that do not have a `.h` or `.hpp` extension, as well as any empty directories that may result from this cleanup. Signed-off-by: Meet Gandhi <[email protected]> Co-authored-by: Meet Gandhi <[email protected]> (cherry picked from commit 096ded0) * Fix CI Signed-off-by: Pablo Garrido <[email protected]> * Fix naming * Ensure naming * New line fix --------- Signed-off-by: Pablo Garrido <[email protected]> Co-authored-by: Meet Gandhi <[email protected]> Co-authored-by: Pablo Garrido <[email protected]>
micro-ROS · Dec 9, 2024 · 1fa614c · 1fa614c
1 parent fdccd24
commit 1fa614c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,9 +44,16 @@ jobs:
         run: |
             (test -f install/micro_ros_setup/lib/micro_ros_setup/build_firmware.sh) && true || false
 
+      - name: Sanitize Artifact Name
+        id: sanitize-name
+        run: |
+          sanitized_name=$(echo "${{ inputs.ci_target_ref }}" | sed 's/[\/:*?"<>|\\]/_/g')
+          echo "sanitized_name=$sanitized_name" >> $GITHUB_ENV
+          echo "::set-output name=sanitized_name::$sanitized_name"
+
       - uses: actions/[email protected]
         with:
-          name: micro_ros_build_${{ inputs.ci_target_ref }}
+          name: micro_ros_build_${{ steps.sanitize-name.outputs.sanitized_name }}
           path: install
 
   micro_ros_agent:
@@ -75,9 +82,16 @@ jobs:
           rosdep update --rosdistro ${{ env.ROS_DISTRO }}
           rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y
 
+      - name: Sanitize Artifact Name
+        id: sanitize-name
+        run: |
+          sanitized_name=$(echo "${{ inputs.ci_target_ref }}" | sed 's/[\/:*?"<>|\\]/_/g')
+          echo "sanitized_name=$sanitized_name" >> $GITHUB_ENV
+          echo "::set-output name=sanitized_name::$sanitized_name"
+
       - uses: actions/[email protected]
         with:
-          name: micro_ros_build_${{ inputs.ci_target_ref }}
+          name: micro_ros_build_${{ steps.sanitize-name.outputs.sanitized_name }}
           path: install
 
       # Workaround https://github.com/actions/upload-artifact/issues/38
@@ -218,9 +232,16 @@ jobs:
           rosdep update --rosdistro ${{ env.ROS_DISTRO }}
           rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y
 
+      - name: Sanitize Artifact Name
+        id: sanitize-name
+        run: |
+          sanitized_name=$(echo "${{ inputs.ci_target_ref }}" | sed 's/[\/:*?"<>|\\]/_/g')
+          echo "sanitized_name=$sanitized_name" >> $GITHUB_ENV
+          echo "::set-output name=sanitized_name::$sanitized_name"
+
       - uses: actions/[email protected]
         with:
-          name: micro_ros_build_${{ inputs.ci_target_ref }}
+          name: micro_ros_build_${{ steps.sanitize-name.outputs.sanitized_name }}
           path: install
 
       # Workaround https://github.com/actions/upload-artifact/issues/38

diff --git a/config/generate_lib/generic/build.sh b/config/generate_lib/generic/build.sh
@@ -48,6 +48,8 @@ pushd $FW_TARGETDIR/mcu_ws >/dev/null
 	done ; \
 	ar rc libmicroros.a $(ls *.o *.obj 2> /dev/null); mkdir -p $BUILD_DIR; cp libmicroros.a $BUILD_DIR; ranlib $BUILD_DIR/libmicroros.a; \
     cp -R $FW_TARGETDIR/mcu_ws/install/include $BUILD_DIR/; \
+    rm $(find $BUILD_DIR/include -type f -not -name "*.h" -not -name "*.hpp"); \
+    rm -rf $(find $BUILD_DIR/include -type d -empty); \
 	cd ..; rm -rf libmicroros;
 
 popd >/dev/null