Merge pull request #1373 from eximious/LinuxDeploy

Update Linux deploy to use LINUXDEPLOY_OUTPUT_VERSION
beeware · Jul 23, 2023 · f956ab9 · f956ab9
2 parents 405c8b6 + 2d0e351
commit f956ab9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/changes/1361.bugfix.rst b/changes/1361.bugfix.rst
@@ -0,0 +1 @@
+Appimages builds now use ``LINUXDEPLOY_OUTPUT_VERSION`` rather than ``VERSION`` to inject the version number.
diff --git a/src/briefcase/platforms/linux/appimage.py b/src/briefcase/platforms/linux/appimage.py
@@ -258,7 +258,7 @@ def build_app(self, app: AppConfig, **kwargs):  # pragma: no-cover-if-is-windows
             try:
                 # For some reason, the version has to be passed in as an
                 # environment variable, *not* in the configuration.
-                env["VERSION"] = app.version
+                env["LINUXDEPLOY_OUTPUT_VERSION"] = app.version
                 # The internals of the binary aren't inherently visible, so
                 # there's no need to package copyright files. These files
                 # appear to be missing by default in the OS dev packages anyway,

diff --git a/tests/platforms/linux/appimage/test_build.py b/tests/platforms/linux/appimage/test_build.py
@@ -186,7 +186,7 @@ def test_build_appimage(build_command, first_app, tmp_path, sub_stream_kw):
         ],
         env={
             "PATH": "/usr/local/bin:/usr/bin:/path/to/somewhere",
-            "VERSION": "0.0.1",
+            "LINUXDEPLOY_OUTPUT_VERSION": "0.0.1",
             "DISABLE_COPYRIGHT_FILES_DEPLOYMENT": "1",
             "APPIMAGE_EXTRACT_AND_RUN": "1",
             "ARCH": "wonky",
@@ -276,7 +276,7 @@ def test_build_appimage_with_plugin(build_command, first_app, tmp_path, sub_stre
         env={
             "PATH": f"{gtk_plugin_path.parent}:{app_dir.parent}:/usr/local/bin:/usr/bin:/path/to/somewhere",
             "DEPLOY_GTK_VERSION": "3",
-            "VERSION": "0.0.1",
+            "LINUXDEPLOY_OUTPUT_VERSION": "0.0.1",
             "DISABLE_COPYRIGHT_FILES_DEPLOYMENT": "1",
             "APPIMAGE_EXTRACT_AND_RUN": "1",
             "ARCH": "wonky",
@@ -353,7 +353,7 @@ def test_build_failure(build_command, first_app, tmp_path, sub_stream_kw):
         ],
         env={
             "PATH": "/usr/local/bin:/usr/bin:/path/to/somewhere",
-            "VERSION": "0.0.1",
+            "LINUXDEPLOY_OUTPUT_VERSION": "0.0.1",
             "DISABLE_COPYRIGHT_FILES_DEPLOYMENT": "1",
             "APPIMAGE_EXTRACT_AND_RUN": "1",
             "ARCH": "wonky",
@@ -416,7 +416,7 @@ def test_build_appimage_in_docker(build_command, first_app, tmp_path, sub_stream
             "--volume",
             f"{build_command.data_path}:/home/brutus/.cache/briefcase:z",
             "--env",
-            "VERSION=0.0.1",
+            "LINUXDEPLOY_OUTPUT_VERSION=0.0.1",
             "--env",
             "DISABLE_COPYRIGHT_FILES_DEPLOYMENT=1",
             "--env",
@@ -540,7 +540,7 @@ def test_build_appimage_with_plugins_in_docker(
                 ":/app:/docker/bin:/docker/sbin"
             ),
             "--env",
-            "VERSION=0.0.1",
+            "LINUXDEPLOY_OUTPUT_VERSION=0.0.1",
             "--env",
             "DISABLE_COPYRIGHT_FILES_DEPLOYMENT=1",
             "--env",
@@ -671,7 +671,7 @@ def test_build_appimage_with_support_package_update(
         ],
         env={
             "PATH": "/usr/local/bin:/usr/bin:/path/to/somewhere",
-            "VERSION": "0.0.1",
+            "LINUXDEPLOY_OUTPUT_VERSION": "0.0.1",
             "DISABLE_COPYRIGHT_FILES_DEPLOYMENT": "1",
             "APPIMAGE_EXTRACT_AND_RUN": "1",
             "ARCH": "wonky",