Skip to content
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.

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

Split dev packages #171

Merged
merged 41 commits into from
Jul 18, 2024
Merged

Split dev packages #171

merged 41 commits into from
Jul 18, 2024

Conversation

at-wat
Copy link
Member

@at-wat at-wat commented Jul 16, 2024

Automatically split dev dependencies and files to -dev subpackage.

All dev packages will be automatically installed if ros-dev meta package is installed.
We can install ros-dev to the base image by default to keep the default behavior.
Users can install packages without dev files by
apk add !ros-dev ...

Dependencies

On master branch, ros-noetic-rospack had following deps

boost-dev
pkgconf
py3-catkin-pkg
py3-rosdep
python3-dev
ros-noetic-ros-environment
so:libboost_filesystem.so.1.84.0
so:libboost_program_options.so.1.84.0
so:libc.musl-x86_64.so.1
so:libgcc_s.so.1
so:libpython3.12.so.1.0
so:libstdc++.so.6
so:libtinyxml2.so.10
tinyxml2-dev

With --split-dev option, ros-noetic-rospack has

pkgconf
py3-catkin-pkg
py3-rosdep
ros-noetic-ros-environment
so:libboost_filesystem.so.1.84.0
so:libboost_program_options.so.1.84.0
so:libc.musl-x86_64.so.1
so:libgcc_s.so.1
so:libpython3.12.so.1.0
so:libstdc++.so.6
so:libtinyxml2.so.10

and ros-noetic-rospack-dev has

boost-dev
pkgconf
python3-dev
tinyxml2-dev

With --split-dev option, ROS packages in build_depends will be resolved as ros-noetic-package + ros-noetic-package-dev in APKBUILD.

Files

For example, ros-noetic-rostime will contain

└── usr
    └── ros
        └── noetic
            ├── lib
            │   └── librostime.so
            └── share
                └── rostime
                    └── package.xml

and ros-noetic-rostime-dev will contain

└── usr
    └── ros
        └── noetic
            ├── include
            │   └── ros
            │       ├── duration.h
            │       ├── impl
            │       │   ├── duration.h
            │       │   └── time.h
            │       ├── rate.h
            │       ├── rostime_decl.h
            │       └── time.h
            ├── lib
            │   └── pkgconfig
            │       └── rostime.pc
            └── share
                └── rostime
                    └── cmake
                        ├── rostimeConfig.cmake
                        └── rostimeConfig-version.cmake

@at-wat at-wat self-assigned this Jul 16, 2024
@at-wat at-wat marked this pull request as draft July 16, 2024 07:46
@at-wat at-wat force-pushed the split-dev-packages branch from c57dbda to e023836 Compare July 16, 2024 07:52
@at-wat at-wat force-pushed the split-dev-packages branch from e023836 to b7de017 Compare July 16, 2024 07:55
Copy link
Contributor

@f-fl0 f-fl0 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Just left a question.

matrix:
env:
- ALPINE_VERSION=3.17 ROS_DISTRO=noetic ROS_DISTRIBUTION_TYPE=ros1
- ALPINE_VERSION=3.17 ROS_DISTRO=humble ROS_DISTRIBUTION_TYPE=ros2
- ALPINE_VERSION=3.20 ROS_DISTRO=noetic ROS_DISTRIBUTION_TYPE=ros1
- ALPINE_VERSION=3.20 ROS_DISTRO=noetic ROS_DISTRIBUTION_TYPE=ros1 SPLIT_DEV=yes
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will we keep both alpine 3.20 noetic jobs or was it just for development?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our Alpine ROS repository will split dev packages, but users still can keep them not splitted when building their packages using ros-abuild-docker image

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ros-abuild:3.20-noetic image is pushed twice but I guess it is not a problem.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm gonna revert the matrix and test split-dev mode in each matrixed job

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed CI

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

Copy link
Member Author

@at-wat at-wat Jul 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our Alpine ROS repository will split dev packages, but users still can keep them not splitted when building their packages using ros-abuild-docker image

I noticed this is wrong.
As ros-noetic-catkin doesn't contain dev files on v3.20, catkin packages on v3.20 must be always built by split-dev mode.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed to test only split-dev mode on v3.20

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated docker image to automatically enable split-dev mode on 3.20

@at-wat at-wat merged commit 012cc70 into master Jul 18, 2024
3 checks passed
@at-wat at-wat deleted the split-dev-packages branch July 18, 2024 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants