Drop support for deprecated Linux AppImage

This commit is contained in:
Veronica Berglyd Olsen
2024-04-20 18:12:51 +02:00
parent 621e933f63
commit e27e066ccc
2 changed files with 6 additions and 14 deletions
+5 -6
View File
@@ -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
+1 -8
View File
@@ -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)