Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pablogs9 merged 5 commits into from
Dec 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c66c5a2
Remove non-header files from include folder (#716)
meetgandhi-dev Dec 9, 2024
ec1bb1e
Fix CI
pablogs9 Dec 9, 2024
175041b
Fix naming
pablogs9 Dec 9, 2024
6d19ac6
Ensure naming
pablogs9 Dec 9, 2024
1427299
New line fix
pablogs9 Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/upload-artifact@v4.4.0
with:
name: micro_ros_build_${{ inputs.ci_target_ref }}
name: micro_ros_build_${{ steps.sanitize-name.outputs.sanitized_name }}
path: install

micro_ros_agent:
Expand Down Expand Up @@ -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/download-artifact@v4.1.7
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
Expand Down Expand Up @@ -217,9 +231,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/download-artifact@v4.1.7
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
Expand Down
2 changes: 2 additions & 0 deletions config/generate_lib/generic/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading