Merge branch 'main' into dev/build-bake

Author: athackst

.github/actions/docker-targets/get_targets.py

@@ -126,10 +126,8 @@ def main() -> int:
     stage_details: list[dict[str, str]] = []
     want_platform = canonical_platform(args.platform) if args.platform else ""
     for item in collect_non_eol(data, args.platform or None):
-        if (
-            not all
-            and changed
-            and (item["family"], item["distro"]) not in changed
+        if (not all and not changed) or (
+            not all and (item["family"], item["distro"]) not in changed
         ):
             continue
         include.append(item)
@@ -144,7 +142,9 @@ def main() -> int:
             if not stage:
                 continue
             platforms = target.get("platforms", "")
-            if want_platform and not platforms_support(platforms, want_platform):
+            if want_platform and not platforms_support(
+                platforms, want_platform
+            ):
                 continue
             stage_details.append(
                 {

.github/actions/docker-targets/tests/test_get_targets.py

@@ -142,6 +142,32 @@ def test_main_returns_all_when_flag_set(self) -> None:
             ],
         )
 
+    def test_main_with_no_changes_produces_empty_outputs(self) -> None:
+        self._write_templates(
+            """
+            ros2:
+              - name: rolling
+                targets:
+                  - target: base
+            """
+        )
+
+        argv = [
+            "get_targets.py",
+            "--all",
+            "false",
+            "--changed",
+            "",
+        ]
+        with patch.object(sys, "argv", argv):
+            exit_code = TARGETS_MODULE.main()
+
+        self.assertEqual(exit_code, 0)
+        outputs = self._outputs()
+        self.assertEqual(outputs.get("distros"), [])
+        self.assertEqual(outputs.get("families"), [])
+        self.assertEqual(outputs.get("stages"), [])
+
     def test_collect_non_eol_respects_platform_filter(self) -> None:
         data = {
             "ros2": [

.vscode/tasks.json

@@ -45,11 +45,18 @@
         }
       ]
     },
+    {
+      "label": "action tests",
+      "type": "shell",
+      "command": "python -m unittest discover -s .github/actions -p 'test_*.py'",
+      "problemMatcher": "$python"
+    },
     {
       "label": "test",
       "dependsOn": [
         "flake8",
-        "pydocstyle"
+        "pydocstyle",
+        "action tests"
       ]
     },
     {