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.

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

Jump to bottom

Merge upstream 20231129 #168

Merged
merged 514 commits into from
Nov 29, 2023
Merged

Merge upstream 20231129 #168

merged 514 commits into from
Nov 29, 2023

Conversation

f-fl0
Copy link

@f-fl0 f-fl0 commented Nov 29, 2023

Manually resolving conflicts that occurred in https://github.com/alpine-ros/rosdistro/actions/runs/7026825181/job/19120222134

Note that the pcsc-lite entry is replaced by pcscd to be consistent with the upstream repository.

jlblancoc and others added 30 commits October 30, 2023 15:49
@jlblancoc
mrpt2: 2.11.2-1 in 'rolling/distribution.yaml' [bloom] (ros#38811)
edae7a9
@jlblancoc
mrpt2: 2.11.2-1 in 'humble/distribution.yaml' [bloom] (ros#38807)
0a93b1d
@achim-k
foxglove_bridge: 0.7.3-1 in 'humble/distribution.yaml' [bloom] (ros#3…
43fad85 
…8810)
@achim-k
foxglove_bridge: 0.7.3-1 in 'rolling/distribution.yaml' [bloom] (ros#…
0277def 
…38813)
@clalancette
joystick_drivers: 3.3.0-1 in 'rolling/distribution.yaml' [bloom] (ros…
2e0a97b 
…#38823)
@clalancette
joystick_drivers: 3.3.0-1 in 'iron/distribution.yaml' [bloom] (ros#38824
e327eff 
)
@clalancette
joystick_drivers: 3.3.0-1 in 'humble/distribution.yaml' [bloom] (ros#…
1240dcb 
…38825)
@olivier-stasse
[rolling] Add odri_master_board_sdk to distribution.yaml (ros#38631)
d89f7dd 
Co-authored-by: Olivier Stasse <olivier.stasse@laas.fr>
@cottsay
Add xtensor rule for RHEL 9 and fix Fedora rule (ros#38843)
0d75821
@bmagyar
teleop_tools: 1.5.0-1 in 'humble/distribution.yaml' [bloom] (ros#38836)
62ea92b
@bmagyar
ros2_control: 3.20.0-1 in 'iron/distribution.yaml' [bloom] (ros#38831)
f992497
@bmagyar
ros2_controllers: 3.17.0-1 in 'iron/distribution.yaml' [bloom] (ros#3…
616fb4c 
…8833)
@bmagyar
teleop_tools: 1.5.0-1 in 'iron/distribution.yaml' [bloom] (ros#38837)
6302dd6
@bjsowa
leo_desktop: 0.3.0-1 in 'noetic/distribution.yaml' [bloom] (ros#38827)
be9ded8
@bjsowa
leo_robot: 2.4.0-1 in 'noetic/distribution.yaml' [bloom] (ros#38828)
23d90cf
@civerachb-cpr
cpr_onav_description: 0.1.10-1 in 'noetic/distribution.yaml' [bloom] (r…
10b3ce3 
…os#38829)
@civerachb-cpr
clearpath_onav_examples: 0.0.3-1 in 'noetic/distribution.yaml' [bloom] (
59dd916 
ros#38830)
@k-okada
jsk_pr2eus: 0.3.15-3 in 'noetic/distribution.yaml' [bloom] (ros#38835)
7ab6650
@syyuen
locator_ros_bridge: 2.1.10-1 in 'rolling/distribution.yaml' [bloom] (r…
e89724d 
…os#38826)
@bmagyar
ros2_control: 3.20.0-1 in 'rolling/distribution.yaml' [bloom] (ros#38832
faf3400 
)
@bmagyar
ros2_controllers: 3.17.0-1 in 'rolling/distribution.yaml' [bloom] (ro…
bb5db0c 
…s#38834)
@bmagyar
teleop_tools: 1.5.0-1 in 'rolling/distribution.yaml' [bloom] (ros#38838)
01fbdfb
@jtbandes
foxglove_msgs: 3.0.0-1 in 'rolling/distribution.yaml' [bloom] (ros#38840
f3c0aac 
)
@bjsowa
leo_common: 1.2.0-1 in 'humble/distribution.yaml' [bloom] (ros#38846)
6c4c947
@ahcorde
ros_gz: 0.247.0-1 in 'iron/distribution.yaml' [bloom] (ros#38845)
d4890d1
@rostest
sick_scan_xd: 3.0.3-1 in 'noetic/distribution.yaml' [bloom] (ros#38844)
81dd253
@fbaygul
add libsodium-dev (ros#38816)
65f471c 
* Update base.yaml

* Update base.yaml

* Update base.yaml

add alpine opensuse and rhel

* Update base.yaml
@tonybaltovski
clearpath_simulator: 0.1.3-1 in 'humble/distribution.yaml' [bloom] (r…
5ca850f 
…os#38847)
@civerachb-cpr
clearpath_msgs: 0.9.5-1 in 'noetic/distribution.yaml' [bloom] (ros#38848
b1f78c7 
)
@tonybaltovski
clearpath_common: 0.1.3-1 in 'humble/distribution.yaml' [bloom] (ros#…
7eaaf86 
…38849)
jlblancoc and others added 21 commits November 25, 2023 18:48
@jlblancoc
mrpt2: 2.11.3-1 in 'humble/distribution.yaml' [bloom] (ros#39082)
fc8a72f
@jlblancoc
mrpt2: 2.11.3-1 in 'noetic/distribution.yaml' [bloom] (ros#39080)
cf509db
@jlblancoc
mrpt2: 2.11.3-1 in 'iron/distribution.yaml' [bloom] (ros#39081)
b9c3f6c
@bmagyar
ros2_control: 2.35.1-1 in 'humble/distribution.yaml' [bloom] (ros#39091)
1480f77
@martiniil
prbt_grippers: EOL in 'noetic/distribution.yaml' (ros#39058)
088c1e0
@victorpaleologue
naoqi_libqicore: 3.0.0-1 in 'humble/distribution.yaml' [bloom] (ros#3…
d50a255 
…8980)
@jpbusch
etsi_its_messages: 1.0.0-1 in 'humble/distribution.yaml' [bloom] (ros…
b2f51cc 
…#39077)
@2b-t
feat: Add MyActuator RMD to ROS 2 Humble distribution (ros#39090)
7c5c954
@facontidavide
plotjuggler: 3.8.2-1 in 'humble/distribution.yaml' [bloom] (ros#39094)
5c9b540
@facontidavide
behaviortree_cpp_v4: 4.4.2-1 in 'rolling/distribution.yaml' [bloom] (r…
87c84bf 
…os#39097)
@facontidavide
behaviortree_cpp_v4: 4.4.2-1 in 'humble/distribution.yaml' [bloom] (r…
fd46b69 
…os#39098)
@facontidavide
plotjuggler: 3.8.2-1 in 'noetic/distribution.yaml' [bloom] (ros#39096)
e557e04
@facontidavide
plotjuggler: 3.8.2-1 in 'rolling/distribution.yaml' [bloom] (ros#39095)
ecf47c2
@christophebedard
topic_tools: 1.3.0-1 in 'rolling/distribution.yaml' [bloom] (ros#39103)
634ce30
@christophebedard
topic_tools: 1.2.0-1 in 'iron/distribution.yaml' [bloom] (ros#39102)
dcdfbe7
@christophebedard
topic_tools: 1.1.1-1 in 'humble/distribution.yaml' [bloom] (ros#39101)
31c27d9
@facontidavide
behaviortree_cpp_v4: 4.4.2-1 in 'noetic/distribution.yaml' [bloom] (r…
e12b5c7 
…os#39100)
@facontidavide
behaviortree_cpp_v4: 4.4.2-1 in 'iron/distribution.yaml' [bloom] (ros…
9b37a78 
…#39099)
@berndpfrommer
added libcaer to humble/iron/rolling (ros#38913)
a0086de
@jpbusch
etsi_its_messages: 1.0.0-1 in 'iron/distribution.yaml' [bloom] (ros#3…
a865653 
…9078)
@f-fl0
Merge remote-tracking branch 'upstream/master' into merge-upstream-20…
a46bca4 
…23-11-29-01-33-53
@f-fl0 f-fl0 requested a review from at-wat November 29, 2023 01:48
@f-fl0 f-fl0 merged commit 1d4bf01 into alpine-custom-apk Nov 29, 2023
3 checks passed
@f-fl0 f-fl0 deleted the merge-upstream-2023-11-29-01-33-53 branch November 29, 2023 02:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@at-wat at-wat at-wat approved these changes

Assignees
No one assigned
Labels
humble iron noetic rolling rosdep
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet