From e27e066ccce1ec54cf650c4ff98d5f27be792253 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sat, 20 Apr 2024 18:12:51 +0200
Subject: [PATCH] Drop support for deprecated Linux AppImage

---
 .github/workflows/build.yml | 11 +++++------
 pkgutils.py                 |  9 +--------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 879cc42f..31b98602 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,10 +40,9 @@ jobs:
   buildLinux:
     needs: buildAssets
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.12"]
-        linux-tag: ["manylinux_2_24_x86_64", "manylinux_2_28_x86_64"]
+    env:
+      PYTHON_VERSION: "3.12"
+      LINUX_TAG: "manylinux_2_28_x86_64"
     steps:
       - name: Python Setup
         uses: actions/setup-python@v5
@@ -64,12 +63,12 @@ jobs:
           path: novelwriter/assets
 
       - name: Build AppImage
-        run: python pkgutils.py build-appimage --linux-tag ${{ matrix.linux-tag }} --python-version ${{ matrix.python-version }}
+        run: python pkgutils.py build-appimage --linux-tag $LINUX_TAG --python-version $PYTHON_VERSION
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: AppImage-${{ matrix.python-version }}-${{ matrix.linux-tag }}
+          name: AppImage-$LINUX_TAG-$PYTHON_VERSION
           path: dist_appimage
           if-no-files-found: error
           retention-days: 14
diff --git a/pkgutils.py b/pkgutils.py
index 328fe78a..cfd3c0bd 100755
--- a/pkgutils.py
+++ b/pkgutils.py
@@ -1073,15 +1073,8 @@ def makeAppImage(sysArgs: list[str]) -> list[str]:
         print("")
         sys.exit(1)
 
-    linuxLabel = ""
-    if not linuxTag.startswith("manylinux_2_28"):
-        linuxLabel = "-oldlinux"
-        if not linuxTag.endswith("x86_64"):
-            # manylinux_2_28 only comes in 64 bit, so this one only applies to older images
-            linuxLabel += "-32bit"
-
     bldFile = glob.glob(f"{bldDir}/*.AppImage")[0]
-    outFile = f"{bldDir}/novelWriter-{pkgVers}{linuxLabel}.AppImage"
+    outFile = f"{bldDir}/novelWriter-{pkgVers}.AppImage"
     os.rename(bldFile, outFile)
     shaFile = makeCheckSum(os.path.basename(outFile), cwd=bldDir)