Skip to content

add 26.04 #106

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

Closed
k-okada wants to merge 5 commits into from
Closed

add 26.04 #106

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fe6a7d9
support ubuntu 26.04
k-okada Jul 15, 2026
cd430f1
ubuntu-distro-info did not output resolute as of 05/10 on 24.04
k-okada May 10, 2026
e580b91
add debug code (set -x)
k-okada May 10, 2026
c611ce0
fix typo resolue -> resolute
k-okada Jul 15, 2026
99639ca
Fix copy-paste error
rhaschke Jul 15, 2026
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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,15 @@ jobs:
strategy:
fail-fast: false
matrix:
DEB_DISTRO: [ bookworm, jammy, noble ]
DEB_DISTRO: [ bookworm, jammy, noble, resolute ]
ARCH: [ x64 ]
BUILD_TIMEOUT: [ 0 ]
include:
# defaults (can be overriden with values from include w/o adding jobs)
- { ROS_SOURCES: good, DEBS: false, VERBOSE: false }
# override/add settings for specific distros
- { DEB_DISTRO: bookworm, DEBS: true, VERBOSE: bloom }
- { DEB_DISTRO: resolute, VERBOSE: true }
- { DEB_DISTRO: noble, VERBOSE: true }
- { DEB_DISTRO: jammy, ARCH: arm64, BUILD_TIMEOUT: 4, ROS_SOURCES: good, DEBS: true, EXPECT_EXIT_CODE: 130 }
# add failing jobs
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
DEB_DISTRO: [jammy, noble]
DEB_DISTRO: [jammy, noble, resolute]

uses: ./.github/workflows/docker.build.yaml
secrets: inherit
Expand All @@ -35,7 +35,7 @@ jobs:
strategy:
fail-fast: false
matrix:
DEB_DISTRO: [jammy, noble]
DEB_DISTRO: [jammy, noble, resolute]

uses: ./.github/workflows/docker.build.yaml
secrets: inherit
Expand All @@ -49,7 +49,7 @@ jobs:
strategy:
fail-fast: false
matrix:
DEB_DISTRO: [jammy, noble]
DEB_DISTRO: [jammy, noble, resolute]

uses: ./.github/workflows/docker.build.yaml
secrets: inherit
Expand All @@ -63,7 +63,7 @@ jobs:
strategy:
fail-fast: false
matrix:
DEB_DISTRO: [jammy, noble]
DEB_DISTRO: [jammy, noble, resolute]

uses: ./.github/workflows/docker.build.yaml
secrets: inherit
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
strategy:
fail-fast: false
matrix:
DEB_DISTRO: [jammy, noble]
DEB_DISTRO: [jammy, noble, resolute]

uses: ./.github/workflows/docker.build.yaml
secrets: inherit
Expand All @@ -105,7 +105,7 @@ jobs:
strategy:
fail-fast: false
matrix:
DEB_DISTRO: [jammy, noble]
DEB_DISTRO: [jammy, noble, resolute]

uses: ./.github/workflows/docker.build.yaml
secrets: inherit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
strategy:
fail-fast: false
matrix:
DEB_DISTRO: [jammy, noble]
DEB_DISTRO: [jammy, noble, resolute]
ARCH: [x64, arm64]
uses: ./.github/workflows/build.yaml
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
DEB_DISTRO: [ jammy, noble ]
DEB_DISTRO: [ jammy, noble, resolute ]
ARCH: [ x64, arm64 ]

uses: ./.github/workflows/packages.build.yaml
Expand Down
3 changes: 2 additions & 1 deletion reprepro/reinit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function process {
case "$f" in
*_arm64.deb) args="-A arm64" ;;
*_amd64.deb) args="-A amd64" ;;
*_all.deb) distros="jammy noble";;
*_all.deb) distros="jammy noble resolute";;
*)
echo "Unknown arch"
exit 1
Expand All @@ -23,6 +23,7 @@ function process {
case $f in
*jammy.*) distros="jammy" ;;
*noble.*) distros="noble" ;;
*noble.*) distros="resolute" ;;
Comment thread
rhaschke marked this conversation as resolved.
Outdated
*)
if [ -z "$distros" ]; then
echo "Unknown distro"
Expand Down
2 changes: 1 addition & 1 deletion reprepro/stage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [ -r ~/.reprepro.env ]; then
fi

# Sanity checks
[ -z "$DISTRO" ] && DISTRO=(jammy noble)
[ -z "$DISTRO" ] && DISTRO=(jammy noble resolute)
[ -z "$ARCH" ] && ARCH=(amd64 arm64)

FAILURE=0
Expand Down
6 changes: 6 additions & 0 deletions ros-one.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,6 +1282,12 @@ known_failures:
- pr2_robot/pr2_ethercat
- moveit_calibration # missing numpy/arrayobject.h
- jsk_recognition/sound_classification # pkg_resources not found
"*/resolute":
- librealsense2
- realsense_ros
- pr2_ethercat_drivers/ethercat_hardware # deprecation of boost/timer.hpp
- pr2_robot/pr2_ethercat
- moveit_calibration # missing numpy/arrayobject.h
"arm64/*":
- ros_realtime/rosrt # multiple definition of boost::atomic_signal_fence
- pr2_gripper_sensor # relies on rosrt
Expand Down
3 changes: 2 additions & 1 deletion src/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,13 @@ esac
export ROS_PYTHON_VERSION=3


set -x
if debian-distro-info --all | grep -q "$DEB_DISTRO"; then
export DISTRIBUTION=debian
export DISTRIBUTION_REPO=http://deb.debian.org/debian
ici_append INSTALL_HOST_GPG_KEYS "sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E98404D386FA1D9 6ED0E7B82643E131 F8D2585B8783D481"

elif ubuntu-distro-info --all | grep -q "$DEB_DISTRO"; then
elif ubuntu-distro-info --all | grep -q "$DEB_DISTRO" || [ "$DEB_DISTRO" = "resolute" ]; then

@rhaschke rhaschke Jul 15, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This shouldn't be necessary.

export DISTRIBUTION=ubuntu
case "$(dpkg --print-architecture)" in
amd64)
Expand Down
Loading