Fixed tests and removed Garden jobs (#112)

* Removed garden from unit tests and workflow jobs Signed-off-by: Saurabh Kamat <[email protected]> * Fixed typo in workflow Signed-off-by: Saurabh Kamat <[email protected]> --------- Signed-off-by: Saurabh Kamat <[email protected]>
gazebo-tooling · Dec 9, 2024 · c98a71c · c98a71c
1 parent a30dfaf
commit c98a71c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 37 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -61,8 +61,8 @@ jobs:
         gazebo_distribution:
           - citadel
           - fortress
-          - garden
           - harmonic
+          - ionic
         exclude:
           # Gazebo Citadel (Dec 2019 - Dec 2024)
           # Compatible ubuntu distributions: 20.04
@@ -78,17 +78,17 @@ jobs:
           - ubuntu_distribution: ubuntu-24.04
             gazebo_distribution: fortress
 
-          # Gazebo Garden (Sep 2022 - Nov 2024)
-          # Compatible ubuntu distributions: 20.04
-          - ubuntu_distribution: ubuntu-22.04
-            gazebo_distribution: garden
-          - ubuntu_distribution: ubuntu-24.04
-            gazebo_distribution: garden
-
           # Gazebo Harmonic (Sep 2023 - Sep 2028)
           # Compatible ubuntu distributions: 22.04, 24.04
           - ubuntu_distribution: ubuntu-20.04
             gazebo_distribution: harmonic
+
+          # Gazebo Ionic (Sep 2024 - Sep 2026)
+          # Compatible ubuntu distributions: 24.04
+          - ubuntu_distribution: ubuntu-20.04
+            gazebo_distribution: ionic
+          - ubuntu_distribution: ubuntu-22.04
+            gazebo_distribution: ionic
     steps:
       - uses: actions/checkout@v4
       - uses: actions/[email protected]
@@ -124,8 +124,8 @@ jobs:
         gazebo_distribution:
           - citadel
           - fortress
-          - garden
           - harmonic
+          - ionic
         exclude:
           # Gazebo Citadel (Dec 2019 - Dec 2024)
           # Compatible ubuntu docker images: focal
@@ -141,17 +141,17 @@ jobs:
           - docker_image: ubuntu:noble
             gazebo_distribution: fortress
 
-          # Gazebo Garden (Sep 2022 - Nov 2024)
-          # Compatible ubuntu docker images: focal
-          - docker_image: ubuntu:jammy
-            gazebo_distribution: garden
-          - docker_image: ubuntu:noble
-            gazebo_distribution: garden
-
           # Gazebo Harmonic (Sep 2023 - Sep 2028)
           # Compatible ubuntu docker images: jammy, noble
           - docker_image: ubuntu:focal
             gazebo_distribution: harmonic
+
+          # Gazebo Ionic (Sep 2024 - Sep 2026)
+          # Compatible ubuntu distributions: 24.04
+          - docker_image: ubuntu:focal
+            gazebo_distribution: ionic
+          - docker_image: ubuntu:jammy
+            gazebo_distribution: ionic
     steps:
       - uses: actions/checkout@v4
       - uses: actions/[email protected]

diff --git a/__test__/main.test.ts b/__test__/main.test.ts
@@ -83,17 +83,17 @@ describe("validate Gazebo distribution test", () => {
 	it("test valid distro", async () => {
 		await expect(utils.validateDistro(["citadel"])).resolves.not.toThrow();
 		await expect(utils.validateDistro(["fortress"])).resolves.not.toThrow();
-		await expect(utils.validateDistro(["garden"])).resolves.not.toThrow();
 		await expect(utils.validateDistro(["harmonic"])).resolves.not.toThrow();
 		await expect(
-			utils.validateDistro(["fortress", "garden"]),
+			utils.validateDistro(["fortress", "harmonic"]),
 		).resolves.not.toThrow();
 	});
 	it("test invalid distro", async () => {
 		await expect(utils.validateDistro(["acropolis"])).rejects.toThrow();
 		await expect(utils.validateDistro(["blueprint"])).rejects.toThrow();
 		await expect(utils.validateDistro(["dome"])).rejects.toThrow();
 		await expect(utils.validateDistro(["edifice"])).rejects.toThrow();
+		await expect(utils.validateDistro(["garden"])).rejects.toThrow();
 		await expect(utils.validateDistro(["doesNotExist"])).rejects.toThrow();
 		await expect(utils.validateDistro(["dome", "fortress"])).rejects.toThrow();
 		await expect(
@@ -189,13 +189,8 @@ describe("generate APT package names for ros_gz", () => {
 			utils.generateROSGzAptPackageNames(["humble"], ["fortress"]),
 		).toEqual(["gz-fortress", "ros-humble-ros-gz"]);
 		await expect(
-			utils.generateROSGzAptPackageNames(["iron"], ["fortress", "garden"]),
-		).toEqual([
-			"gz-fortress",
-			"ros-iron-ros-gz",
-			"gz-garden",
-			"ros-iron-ros-gzgarden",
-		]);
+			utils.generateROSGzAptPackageNames(["iron"], ["fortress"]),
+		).toEqual(["gz-fortress", "ros-iron-ros-gz"]);
 		await expect(
 			utils.generateROSGzAptPackageNames(["jazzy"], ["harmonic"]),
 		).toEqual(["ros-jazzy-ros-gz"]);

diff --git a/dist/index.js b/dist/index.js
@@ -26640,10 +26640,6 @@ const utils = __importStar(__nccwpck_require__(1314));
 const conda = __importStar(__nccwpck_require__(7725));
 // List of mapped Gazebo distro to gz-sim versions
 const validLibVersions = [
-    {
-        distro: "garden",
-        libVersion: 7,
-    },
     {
         distro: "harmonic",
         libVersion: 8,
@@ -26819,13 +26815,13 @@ const validROSGzDistrosList = [
     {
         rosDistro: "humble",
         officialROSGzWrappers: ["fortress"],
-        unofficialROSGzWrappers: ["garden", "harmonic"],
+        unofficialROSGzWrappers: ["harmonic"],
         vendorPackagesAvailable: false,
     },
     {
         rosDistro: "iron",
         officialROSGzWrappers: ["fortress"],
-        unofficialROSGzWrappers: ["garden", "harmonic"],
+        unofficialROSGzWrappers: ["harmonic"],
         vendorPackagesAvailable: false,
     },
     {

diff --git a/src/setup-gazebo-windows.ts b/src/setup-gazebo-windows.ts
@@ -3,10 +3,6 @@ import * as conda from "./package_manager/conda";
 
 // List of mapped Gazebo distro to gz-sim versions
 const validLibVersions: { distro: string; libVersion: number }[] = [
-	{
-		distro: "garden",
-		libVersion: 7,
-	},
 	{
 		distro: "harmonic",
 		libVersion: 8,

diff --git a/src/utils.ts b/src/utils.ts
@@ -19,13 +19,13 @@ const validROSGzDistrosList: {
 	{
 		rosDistro: "humble",
 		officialROSGzWrappers: ["fortress"],
-		unofficialROSGzWrappers: ["garden", "harmonic"],
+		unofficialROSGzWrappers: ["harmonic"],
 		vendorPackagesAvailable: false,
 	},
 	{
 		rosDistro: "iron",
 		officialROSGzWrappers: ["fortress"],
-		unofficialROSGzWrappers: ["garden", "harmonic"],
+		unofficialROSGzWrappers: ["harmonic"],
 		vendorPackagesAvailable: false,
 	},
 	{