From 4f06088521b09953021a3daa37cad389029f54f5 Mon Sep 17 00:00:00 2001
From: Alexander Sherikov <alexander@sherikov.net>
Date: Sun, 22 Dec 2024 14:16:24 +0400
Subject: [PATCH] Add Ubuntu 24 (Noble) / ROS2 Jazzy support

---
 .github/workflows/master.yml                 | 9 ++++++++-
 ccws/make/new.mk                             | 3 +++
 ccws/profiles/build/common/setup.bash        | 4 ++++
 ccws/profiles/build/deb/lintian_noble.supp   | 1 +
 ccws/profiles/build/deb/targets.mk           | 4 ++--
 ccws/profiles/build/static_checks/targets.mk | 4 ++++
 ccws/tests/test_main_ros2.mk                 | 1 +
 7 files changed, 23 insertions(+), 3 deletions(-)
 create mode 120000 ccws/profiles/build/deb/lintian_noble.supp

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 504c0bd..84611ac 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -3,7 +3,7 @@ on:
         branches:
             - '**'
         tags:
-            - 'NEVER' 
+            - 'NEVER'
     pull_request:
         types: [opened, reopened]
 
@@ -37,6 +37,13 @@ jobs:
             - uses: actions/checkout@v4
             - run: make -f ccws/tests/test_main_ros2.mk ROS_DISTRO=humble
 
+    noble_ros2:
+        runs-on: ubuntu-24.04
+
+        steps:
+            - uses: actions/checkout@v4
+            - run: make -f ccws/tests/test_main_ros2.mk ROS_DISTRO=jazzy
+
     jammy_ros2_src:
         runs-on: ubuntu-22.04
 
diff --git a/ccws/make/new.mk b/ccws/make/new.mk
index 19fdd6e..e2f484f 100644
--- a/ccws/make/new.mk
+++ b/ccws/make/new.mk
@@ -17,3 +17,6 @@ new_focal:
 new_jammy:
 	cp -R ${CCWS_DIR}/examples/pkg_ament "${WORKSPACE_SRC}/${PKG}"
 
+new_noble: new_jammy
+	#
+
diff --git a/ccws/profiles/build/common/setup.bash b/ccws/profiles/build/common/setup.bash
index c7b3fb5..d95e8b5 100644
--- a/ccws/profiles/build/common/setup.bash
+++ b/ccws/profiles/build/common/setup.bash
@@ -139,6 +139,8 @@ then
                 ROS_DISTRO=noetic;;
             jammy)
                 ROS_DISTRO=humble;;
+            noble)
+                ROS_DISTRO=jazzy;;
         esac
     fi
 fi
@@ -168,6 +170,8 @@ case "${OS_DISTRO_HOST}" in
         CCWS_LLVM_VERSION=12;;
     jammy)
         CCWS_LLVM_VERSION=15;;
+    noble)
+        CCWS_LLVM_VERSION=19;;
 esac
 export CCWS_LLVM_VERSION
 
diff --git a/ccws/profiles/build/deb/lintian_noble.supp b/ccws/profiles/build/deb/lintian_noble.supp
new file mode 120000
index 0000000..fc2ac9f
--- /dev/null
+++ b/ccws/profiles/build/deb/lintian_noble.supp
@@ -0,0 +1 @@
+lintian_jammy.supp
\ No newline at end of file
diff --git a/ccws/profiles/build/deb/targets.mk b/ccws/profiles/build/deb/targets.mk
index 9e0c582..cdbae6a 100644
--- a/ccws/profiles/build/deb/targets.mk
+++ b/ccws/profiles/build/deb/targets.mk
@@ -47,8 +47,8 @@ private_dpkg_deb_focal: private_dpkg_deb_bionic
 private_dpkg_deb_jammy:
 	dpkg-deb -Zzstd -z9 --root-owner-group --build "${CCWS_INSTALL_DIR_BUILD_ROOT}" "${CCWS_ARTIFACTS_DIR}/${CCWS_PKG_FULL_NAME}.deb"
 
-private_dpkg_deb_noble: private_dpkg_deb_jammy
-	# TODO: --threads-max= (since 1.21.9)
+private_dpkg_deb_noble: 
+	dpkg-deb -Zzstd -z9 --root-owner-group --threads-max=${JOBS} --build "${CCWS_INSTALL_DIR_BUILD_ROOT}" "${CCWS_ARTIFACTS_DIR}/${CCWS_PKG_FULL_NAME}.deb"
 
 
 private_deb_version_hash: assert_PKG_arg_must_be_specified
diff --git a/ccws/profiles/build/static_checks/targets.mk b/ccws/profiles/build/static_checks/targets.mk
index 698fd84..0caeda4 100644
--- a/ccws/profiles/build/static_checks/targets.mk
+++ b/ccws/profiles/build/static_checks/targets.mk
@@ -20,6 +20,10 @@ bp_static_checks_install_build_focal:
 bp_static_checks_install_build_jammy: install_python3
 	${PIP3_INSTALL} catkin-lint
 
+#ubuntu24
+bp_static_checks_install_build_noble: bp_static_checks_install_build_jammy
+	# passthrough
+
 bp_static_checks_install_build_python: install_python3
 	${PIP3_INSTALL} pylint
 	${PIP3_INSTALL} flake8
diff --git a/ccws/tests/test_main_ros2.mk b/ccws/tests/test_main_ros2.mk
index ed7e2d4..42603c6 100644
--- a/ccws/tests/test_main_ros2.mk
+++ b/ccws/tests/test_main_ros2.mk
@@ -65,6 +65,7 @@ test:
 	rm -Rf "${WORKSPACE_SRC}/.ccws"
 	# ---
 	# static checks
+	apt purge flake8 # broken?
 	${MAKE} bp_install_build BUILD_PROFILE=static_checks
 	${MAKE} BUILD_PROFILE=static_checks