add jazzy support (#863)

Signed-off-by: ijnek <kenjibrameld@gmail.com>
ros-tooling · Apr 28, 2024 · b418fc0 · b418fc0
1 parent 0fad106
commit b418fc0
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 9 deletions.
diff --git a/...dirs_with_same_name_as_repo_rolling.repos → ...t_dirs_with_same_name_as_repo_noble.repos b/...dirs_with_same_name_as_repo_rolling.repos → ...t_dirs_with_same_name_as_repo_noble.repos
diff --git a/...orkflows/repo_file_for_test_rolling.repos → .../workflows/repo_file_for_test_noble.repos b/...orkflows/repo_file_for_test_rolling.repos → .../workflows/repo_file_for_test_noble.repos
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -69,8 +69,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [macOS-latest, windows-2019]
-        ros_distribution: [humble, iron]
-    env: 
+        ros_distribution: [humble, iron, jazzy]
+    env:
       INSTALL_TYPE: ${{ matrix.os == 'windows-2019' && 'merged' || 'default' }}
       INSTALL_PATH: ${{ matrix.os == 'windows-2019' && 'install/share' || 'install' }}
     steps:
@@ -185,6 +185,7 @@ jobs:
         ros_distribution:
           - humble
           - iron
+          - jazzy
           - rolling
         # Define the Docker image(s) associated with each ROS distribution.
         # The include syntax allows additional variables to be defined, like
@@ -201,6 +202,10 @@ jobs:
           - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-iron-ros-base-latest
             ros_distribution: iron
 
+          # Jazzy Jalisco (May 2024 - May 2029)
+          - docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-jazzy-ros-base-latest
+            ros_distribution: jazzy
+
           # Rolling Ridley (see REP 2002: https://www.ros.org/reps/rep-2002.html)
           - docker_image: rostooling/setup-ros-docker:ubuntu-noble-ros-rolling-ros-base-latest
             ros_distribution: rolling
@@ -246,18 +251,24 @@ jobs:
             ros_distribution: humble
           - os: ubuntu:22.04
             ros_distribution: iron
+          - os: ubuntu:24.04
+            ros_distribution: jazzy
           - os: ubuntu:24.04
             ros_distribution: rolling
           - os: windows-2019
             ros_distribution: humble
           - os: windows-2019
             ros_distribution: iron
+          - os: windows-2019
+            ros_distribution: jazzy
           - os: windows-2019
             ros_distribution: rolling
           - os: macOS-latest
             ros_distribution: humble
           - os: macOS-latest
             ros_distribution: iron
+          - os: macOS-latest
+            ros_distribution: jazzy
           - os: macOS-latest
             ros_distribution: rolling
     env:
@@ -323,7 +334,7 @@ jobs:
         id: test_repo
         name: "Test single package, with custom repository file"
         with:
-          vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test${{ matrix.ros_distribution == 'rolling' && '_rolling' || '' }}.repos"
+          vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test${{ matrix.os == 'ubuntu:24.04' && '_noble' || '' }}.repos"
           package-name: ament_copyright
           target-ros2-distro: ${{ matrix.ros_distribution }}
       - name: "Check that ament_copyright install directory is present in ${{ env.INSTALL_TYPE }} install space"
@@ -353,7 +364,7 @@ jobs:
         name: "Test single package, with multiple custom repository files"
         with:
           vcs-repo-file-url: |
-            .github/workflows/repo_file_for_test${{ matrix.ros_distribution == 'rolling' && '_rolling' || '' }}.repos
+            .github/workflows/repo_file_for_test${{ matrix.os == 'ubuntu:24.04' && '_noble' || '' }}.repos
             .github/workflows/repo_file_for_test_cpp_package.repos
           package-name: ament_copyright
           target-ros2-distro: ${{ matrix.ros_distribution }}
@@ -387,7 +398,7 @@ jobs:
         with:
           package-name: ament_cmake_core
           target-ros2-distro: ${{ matrix.ros_distribution }}
-          vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test${{ matrix.ros_distribution == 'rolling' && '_rolling' || '' }}.repos"
+          vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test${{ matrix.os == 'ubuntu:24.04' && '_noble' || '' }}.repos"
           # We use a long unique string here to make sure that if this string
           # is found in CMakeCache.txt, it means the additional CMake flag has
           # been passed successfully. Non recognized flags are also written by
@@ -432,6 +443,7 @@ jobs:
         ros_distribution:
           - humble
           - iron
+          - jazzy
           - rolling
 
         # Define the Docker image(s) associated with each ROS distribution.
@@ -451,6 +463,11 @@ jobs:
             ros_distribution: iron
             distro_repos_url: https://raw.githubusercontent.com/ros2/ros2/iron/ros2.repos
 
+          # Jazzy Jalisco (May 2024 - May 2029)
+          - docker_image: ubuntu:noble
+            ros_distribution: jazzy
+            distro_repos_url: https://raw.githubusercontent.com/ros2/ros2/jazzy/ros2.repos
+
           # Rolling Ridley (see REP 2002: https://www.ros.org/reps/rep-2002.html)
           - docker_image: ubuntu:noble
             ros_distribution: rolling
@@ -517,7 +534,7 @@ jobs:
         id: test_repo
         name: "Test single package, with custom repository file"
         with:
-          vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test${{ matrix.ros_distribution == 'rolling' && '_rolling' || '' }}.repos"
+          vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test${{ matrix.os == 'ubuntu:24.04' && '_noble' || '' }}.repos"
           package-name: ament_copyright
           target-ros2-distro: ${{ matrix.ros_distribution }}
       - run: test -d "${{ steps.test_repo.outputs.ros-workspace-directory-name }}/install/ament_copyright"
@@ -530,7 +547,7 @@ jobs:
         name: "Test single package, with multiple custom repository files"
         with:
           vcs-repo-file-url: |
-            .github/workflows/repo_file_for_test${{ matrix.ros_distribution == 'rolling' && '_rolling' || '' }}.repos
+            .github/workflows/repo_file_for_test${{ matrix.os == 'ubuntu:24.04' && '_noble' || '' }}.repos
             .github/workflows/repo_file_for_test_cpp_package.repos
           package-name: ament_copyright
           target-ros2-distro: ${{ matrix.ros_distribution }}
@@ -561,7 +578,7 @@ jobs:
         with:
           package-name: ament_cmake_core
           target-ros2-distro: ${{ matrix.ros_distribution }}
-          vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test${{ matrix.ros_distribution == 'rolling' && '_rolling' || '' }}.repos"
+          vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test${{ matrix.os == 'ubuntu:24.04' && '_noble' || '' }}.repos"
           # We use a long unique string here to make sure that if this string
           # is found in CMakeCache.txt, it means the additional CMake flag has
           # been passed successfully. Non recognized flags are also written by
@@ -578,6 +595,6 @@ jobs:
         with:
           package-name: ament_copyright
           target-ros2-distro: ${{ matrix.ros_distribution }}
-          vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test_dirs_with_same_name_as_repo${{ matrix.ros_distribution == 'rolling' && '_rolling' || '' }}.repos"
+          vcs-repo-file-url: "${{ github.workspace }}/.github/workflows/repo_file_for_test_dirs_with_same_name_as_repo${{ matrix.os == 'ubuntu:24.04' && '_noble' || '' }}.repos"
       - run: test -d "${{ steps.test_directories_with_same_name_as_repo.outputs.ros-workspace-directory-name }}/src/action-ros-ci/foo"
       - run: test -d "${{ steps.test_directories_with_same_name_as_repo.outputs.ros-workspace-directory-name }}/src/foo/action-ros-ci/bar"
diff --git a/__tests__/ros-ci.test.ts b/__tests__/ros-ci.test.ts
@@ -41,6 +41,7 @@ describe("validate distribution test", () => {
 		expect(actionRosCi.validateDistros("", "galactic")).toBe(true);
 		expect(actionRosCi.validateDistros("", "humble")).toBe(true);
 		expect(actionRosCi.validateDistros("", "iron")).toBe(true);
+		expect(actionRosCi.validateDistros("", "jazzy")).toBe(true);
 		expect(actionRosCi.validateDistros("", "rolling")).toBe(true);
 
 		expect(actionRosCi.validateDistros("noetic", "rolling")).toBe(true);

diff --git a/dist/index.js b/dist/index.js
@@ -11165,6 +11165,7 @@ const validROS2Distros = [
     "galactic",
     "humble",
     "iron",
+    "jazzy",
     "rolling",
 ];
 const targetROS1DistroInput = "target-ros1-distro";

diff --git a/src/action-ros-ci.ts b/src/action-ros-ci.ts
@@ -18,6 +18,7 @@ const validROS2Distros: string[] = [
 	"galactic",
 	"humble",
 	"iron",
+	"jazzy",
 	"rolling",
 ];
 const targetROS1DistroInput: string = "target-ros1-distro";