fix: allow coreXX-desktop bases

Fixes #4818
canonical · Jun 11, 2024 · 578cfc1 · 578cfc1
1 parent 6aa3696
commit 578cfc1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/snapcraft/models/project.py b/snapcraft/models/project.py
@@ -645,9 +645,15 @@ def _providers_base(cls, base: str) -> bases.BaseAlias | None:
         """
         if base == "bare":
             return None
+        # Desktop bases are extended versions of the regular core bases.
+        # For bases that end with "-desktop", use the equivalent provider base.
+        if base.endswith("-desktop"):
+            core_base = base.rpartition("-")[0]
+        else:
+            core_base = base
 
         try:
-            return SNAPCRAFT_BASE_TO_PROVIDER_BASE[base]
+            return SNAPCRAFT_BASE_TO_PROVIDER_BASE[core_base]
         except KeyError as err:
             raise CraftValidationError(f"Unknown base {base!r}") from err
 

diff --git a/tests/unit/models/test_projects.py b/tests/unit/models/test_projects.py
@@ -587,7 +587,12 @@ def test_project_build_base_devel_grade_stable_error(self, project_yaml_data):
 
     @pytest.mark.parametrize(
         ("base", "expected_base"),
-        [("bare", None), *providers.SNAPCRAFT_BASE_TO_PROVIDER_BASE.items()],
+        [
+            ("bare", None),
+            *providers.SNAPCRAFT_BASE_TO_PROVIDER_BASE.items(),
+            ("core22-desktop", providers.SNAPCRAFT_BASE_TO_PROVIDER_BASE["core22"]),
+            ("core24-desktop", providers.SNAPCRAFT_BASE_TO_PROVIDER_BASE["core24"]),
+        ],
     )
     def test_provider_base(self, base, expected_base, project_yaml_data):
         providers_base = Project._providers_base(base)