Disable building AppImages on Apple Silicon

- On Apple Silicon, Docker Desktop runs x86-64 containers in an emulation mode in an arm64 Linux VM; however, due to present issues in the implementation of QEMU used, AppImages cannot successfully run. Since linuxdeploy itself is an AppImage, it cannot run and AppImages cannot be created.
beeware · Jul 31, 2023 · 2ef9191 · 2ef9191
1 parent 1e6184c
commit 2ef9191
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 26 deletions.
diff --git a/src/briefcase/integrations/linuxdeploy.py b/src/briefcase/integrations/linuxdeploy.py
@@ -50,15 +50,13 @@ def file_path(self) -> Path:
         """The folder on the local filesystem that contains the file_name."""
 
     @classmethod
-    def arch(cls, host_os: str, host_arch: str) -> str:
-        # always use the x86-64 arch on macOS since the
-        # manylinux image will always be x86-64 for macOS
-        arch = "x86_64" if host_os == "Darwin" else host_arch
+    def arch(cls, host_arch: str) -> str:
+        """The architecture defined (and supported) by linuxdeploy for AppImages."""
         try:
             return {
                 "x86_64": "x86_64",
                 "i686": "i386",
-            }[arch]
+            }[host_arch]
         except KeyError as e:
             raise UnsupportedHostError(
                 f"Linux AppImages cannot be built on {host_arch}."
@@ -224,7 +222,7 @@ class LinuxDeployQtPlugin(LinuxDeployPluginBase, ManagedTool):
 
     @property
     def file_name(self) -> str:
-        return f"linuxdeploy-plugin-qt-{self.arch(self.tools.host_os, self.tools.host_arch)}.AppImage"
+        return f"linuxdeploy-plugin-qt-{self.arch(self.tools.host_arch)}.AppImage"
 
     @property
     def download_url(self) -> str:
@@ -335,7 +333,7 @@ def file_path(self) -> Path:
 
     @property
     def file_name(self) -> str:
-        return f"linuxdeploy-{self.arch(self.tools.host_os, self.tools.host_arch)}.AppImage"
+        return f"linuxdeploy-{self.arch(self.tools.host_arch)}.AppImage"
 
     @property
     def download_url(self) -> str:

diff --git a/src/briefcase/platforms/linux/appimage.py b/src/briefcase/platforms/linux/appimage.py
@@ -44,7 +44,7 @@ def project_path(self, app):
 
     def binary_name(self, app):
         safe_name = app.formal_name.replace(" ", "_")
-        arch = LinuxDeploy.arch(self.tools.host_os, self.tools.host_arch)
+        arch = LinuxDeploy.arch(self.tools.host_arch)
         return f"{safe_name}-{app.version}-{arch}.AppImage"
 
     def binary_path(self, app):
@@ -163,7 +163,7 @@ def output_format_template_context(self, app: AppConfig):
             manylinux_arch = {
                 "x86_64": "x86_64",
                 "i386": "i686",
-            }[LinuxDeploy.arch(self.tools.host_os, self.tools.host_arch)]
+            }[LinuxDeploy.arch(self.tools.host_arch)]
             context["manylinux_image"] = f"{app.manylinux}_{manylinux_arch}:{tag}"
             if app.manylinux in {"manylinux1", "manylinux2010", "manylinux2014"}:
                 context["vendor_base"] = "centos"

diff --git a/tests/integrations/linuxdeploy/test_LinuxDeployQtPlugin__properties.py b/tests/integrations/linuxdeploy/test_LinuxDeployQtPlugin__properties.py
@@ -22,7 +22,6 @@ def test_file_path(mock_tools, linuxdeploy_qt_plugin):
         ("Linux", "x86_64", "x86_64"),
         ("Linux", "i686", "i386"),
         ("Darwin", "x86_64", "x86_64"),
-        ("Darwin", "arm64", "x86_64"),
     ],
 )
 def test_file_name(mock_tools, host_os, host_arch, linuxdeploy_arch):
@@ -48,7 +47,6 @@ def test_plugin_id(linuxdeploy_qt_plugin):
         ("Linux", "x86_64", "x86_64"),
         ("Linux", "i686", "i386"),
         ("Darwin", "x86_64", "x86_64"),
-        ("Darwin", "arm64", "x86_64"),
     ],
 )
 def test_download_url(mock_tools, host_os, host_arch, linuxdeploy_arch):

diff --git a/tests/integrations/linuxdeploy/test_LinuxDeploy__properties.py b/tests/integrations/linuxdeploy/test_LinuxDeploy__properties.py
@@ -24,7 +24,6 @@ def test_file_path(linuxdeploy, mock_tools):
         ("Linux", "x86_64", "x86_64"),
         ("Linux", "i686", "i386"),
         ("Darwin", "x86_64", "x86_64"),
-        ("Darwin", "arm64", "x86_64"),
     ],
 )
 def test_file_name(mock_tools, host_os, host_arch, linuxdeploy_arch):
@@ -54,7 +53,6 @@ def test_file_name_unsupported_arch(mock_tools):
         ("Linux", "x86_64", "x86_64"),
         ("Linux", "i686", "i386"),
         ("Darwin", "x86_64", "x86_64"),
-        ("Darwin", "arm64", "x86_64"),
     ],
 )
 def test_download_url(mock_tools, host_os, host_arch, linuxdeploy_arch):

diff --git a/tests/platforms/linux/appimage/test_create.py b/tests/platforms/linux/appimage/test_create.py
@@ -178,19 +178,6 @@ def test_finalize_nodocker(create_command, first_app_config, capsys):
                 "use_non_root_user": False,
             },
         ),
-        # macOS on Apple Silicon
-        (
-            "manylinux2014",
-            None,
-            "Darwin",
-            "arm64",
-            True,
-            {
-                "manylinux_image": "manylinux2014_x86_64:latest",
-                "vendor_base": "centos",
-                "use_non_root_user": False,
-            },
-        ),
     ],
 )
 def test_output_format_template_context(