diff --git a/appimagebuilder/commands/setup_runtime.py b/appimagebuilder/commands/setup_runtime.py index 5341aeca..7e78253e 100644 --- a/appimagebuilder/commands/setup_runtime.py +++ b/appimagebuilder/commands/setup_runtime.py @@ -30,12 +30,10 @@ def __call__(self, *args, **kwargs): apprun_version = self.context.recipe.AppDir.runtime.version() or "v2.0.0" apprun_version = version.parse(apprun_version) runtime_setup = None - if ( - version.parse("v2.0.0") <= apprun_version < version.parse("v3.0.0") - ) or apprun_version == version.parse("continuous"): + if version.parse("v2.0.0") <= apprun_version < version.parse("v3.0.0"): runtime_setup = AppRunV2Setup(self.context, self._finder) - if not runtime_setup and version.parse("v3.0.0-devel") <= apprun_version < version.parse("v4.0.0"): + if not runtime_setup and version.parse("v3.0.0") <= apprun_version < version.parse("v4.0.0"): runtime_setup = AppRunV3Setup(self.context) if not runtime_setup: diff --git a/recipes/appimage-builder/AppImageBuilder.yml b/recipes/appimage-builder/AppImageBuilder.yml index 2304b9b8..be24d4fd 100644 --- a/recipes/appimage-builder/AppImageBuilder.yml +++ b/recipes/appimage-builder/AppImageBuilder.yml @@ -1,3 +1,7 @@ +# To build AppImageBuilder, specify explicit AppDir path other than current directory +# e.g. +# cd recipes/appimage-builder +# APPIMAGE_BUILDER_VERSION=eaadff4 python ../../__main__.py --recipe AppImageBuilder.yml --appdir /tmp/appimage-builder version: 1 script: # Remove any previous build @@ -15,14 +19,14 @@ AppDir: # Set the python executable as entry point exec: usr/bin/python3 # Set the application main script path as argument. Use '$@' to forward CLI parameters - exec_args: "$APPDIR/usr/bin/appimage-builder $@" + exec_args: "$APPDIR/usr/local/bin/appimage-builder $@" apt: arch: amd64 sources: - - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal main restricted universe multiverse' - - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe multiverse' - key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3b4fe6acc0b21f32' + - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' + - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse' + key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C' include: - bash @@ -34,7 +38,7 @@ AppDir: - fakeroot - libgdk-pixbuf2.0-dev - patchelf - - python3.8 + - python3.10 - squashfs-tools - strace - zsync @@ -46,20 +50,20 @@ AppDir: ln -s bash $TARGET_APPDIR/bin/sh # install appimage-builder - python3.8 -m pip install --ignore-installed --prefix=/usr --root="$TARGET_APPDIR" install ../../ - python3.8 -m pip install --ignore-installed --prefix=/usr --root="$TARGET_APPDIR" install certifi + python3.10 -m pip install --ignore-installed --prefix=/usr --root="$TARGET_APPDIR" install ../../ + python3.10 -m pip install --ignore-installed --prefix=/usr --root="$TARGET_APPDIR" install certifi runtime: - version: "continuous" + version: "v2.0.0" env: # Set python home # See https://docs.python.org/3/using/cmdline.html#envvar-PYTHONHOME PYTHONHOME: '${APPDIR}/usr' # Path to the site-packages dir or other modules dirs # See https://docs.python.org/3/using/cmdline.html#envvar-PYTHONPATH - PYTHONPATH: '${APPDIR}/usr/lib/python3.8/site-packages' + PYTHONPATH: '${APPDIR}/usr/lib/python3.10/site-packages' # SSL Certificates are placed in a different location for every system therefore we ship our own copy - SSL_CERT_FILE: '${APPDIR}/usr/lib/python3.8/site-packages/certifi/cacert.pem' + SSL_CERT_FILE: '${APPDIR}/usr/lib/python3.10/site-packages/certifi/cacert.pem' test: fedora: @@ -83,4 +87,4 @@ AppImage: update-information: 'gh-releases-zsync|AppImageCrafters|appimage-builder|latest|-*x86_64.AppImage.zsync' sign-key: None arch: x86_64 - + comp: gzip diff --git a/recipes/bash-files/AppImageBuilder.yml b/recipes/bash-files/AppImageBuilder.yml index a305b222..e6ba1637 100644 --- a/recipes/bash-files/AppImageBuilder.yml +++ b/recipes/bash-files/AppImageBuilder.yml @@ -25,7 +25,7 @@ AppDir: runtime: arch: [ x86_64, i386 ] - version: continuous + test: debian: @@ -48,3 +48,4 @@ AppDir: AppImage: arch: x86_64 + comp: gzip diff --git a/recipes/bash-pacman/AppImageBuilder.yml b/recipes/bash-pacman/AppImageBuilder.yml index 7cc126d0..effad926 100644 --- a/recipes/bash-pacman/AppImageBuilder.yml +++ b/recipes/bash-pacman/AppImageBuilder.yml @@ -53,4 +53,5 @@ AppDir: AppImage: update-information: None sign-key: None - arch: x86_64 \ No newline at end of file + arch: x86_64 + comp: gzip \ No newline at end of file diff --git a/recipes/bash/AppImageBuilder.yml b/recipes/bash/AppImageBuilder.yml index 3684f3a2..5c2ca863 100644 --- a/recipes/bash/AppImageBuilder.yml +++ b/recipes/bash/AppImageBuilder.yml @@ -44,7 +44,7 @@ AppDir: runtime: arch: [ x86_64, i386 ] - version: continuous + test: debian: @@ -67,3 +67,4 @@ AppDir: AppImage: arch: x86_64 + comp: gzip diff --git a/recipes/gimp/AppImageBuilder.yml b/recipes/gimp/AppImageBuilder.yml index 0b63af43..783a07a2 100644 --- a/recipes/gimp/AppImageBuilder.yml +++ b/recipes/gimp/AppImageBuilder.yml @@ -85,7 +85,7 @@ AppDir: - usr/share/doc/*/TODO.* - usr/include runtime: - version: continuous + path_mappings: - /etc/gimp:$APPDIR/etc/gimp - /usr/lib/gimp:$APPDIR/usr/lib/gimp @@ -117,3 +117,4 @@ AppDir: AppImage: arch: x86_64 + comp: gzip diff --git a/recipes/gnome-calculator/AppImageBuilder.yml b/recipes/gnome-calculator/AppImageBuilder.yml index 93727155..c790a235 100644 --- a/recipes/gnome-calculator/AppImageBuilder.yml +++ b/recipes/gnome-calculator/AppImageBuilder.yml @@ -27,9 +27,6 @@ AppDir: - ubuntu-mono - fonts-*-core - runtime: - version: "continuous" - files: exclude: - usr/lib/x86_64-linux-gnu/gconv @@ -61,3 +58,4 @@ AppImage: update-information: None sign-key: None arch: x86_64 + comp: gzip diff --git a/recipes/hello-world-gtk/AppImageBuilder.yml b/recipes/hello-world-gtk/AppImageBuilder.yml index ab377384..80f1e810 100644 --- a/recipes/hello-world-gtk/AppImageBuilder.yml +++ b/recipes/hello-world-gtk/AppImageBuilder.yml @@ -31,9 +31,6 @@ AppDir: - ubuntu-mono - fonts-*-core - runtime: - version: "continuous" - files: exclude: - usr/lib/x86_64-linux-gnu/gconv @@ -67,3 +64,4 @@ AppImage: update-information: None sign-key: None arch: x86_64 + comp: gzip diff --git a/recipes/hello-world-qt5/AppImageBuilder.yml b/recipes/hello-world-qt5/AppImageBuilder.yml index 933ef11b..a7b983f3 100644 --- a/recipes/hello-world-qt5/AppImageBuilder.yml +++ b/recipes/hello-world-qt5/AppImageBuilder.yml @@ -65,3 +65,4 @@ AppDir: AppImage: arch: x86_64 update-information: guess + comp: gzip diff --git a/recipes/hello-world-qt6/AppImageBuilder.yml b/recipes/hello-world-qt6/AppImageBuilder.yml index 26440987..28565018 100644 --- a/recipes/hello-world-qt6/AppImageBuilder.yml +++ b/recipes/hello-world-qt6/AppImageBuilder.yml @@ -107,3 +107,4 @@ AppDir: AppImage: arch: x86_64 update-information: guess + comp: gzip diff --git a/recipes/kcalc-files/AppImageBuilder.yml b/recipes/kcalc-files/AppImageBuilder.yml index 4cdf0fee..a5a55c27 100644 --- a/recipes/kcalc-files/AppImageBuilder.yml +++ b/recipes/kcalc-files/AppImageBuilder.yml @@ -158,8 +158,7 @@ AppDir: - usr/share/doc/*/changelog.* - usr/share/doc/*/NEWS.* - usr/share/doc/*/TODO.* - runtime: - version: v2.0.0-alpha + runtime: {} test: fedora-30: image: appimagecrafters/tests-env:fedora-30 @@ -179,3 +178,4 @@ AppDir: AppImage: arch: x86_64 update-information: guess + comp: gzip diff --git a/recipes/kcalc-nbc/AppImageBuilder.yml b/recipes/kcalc-nbc/AppImageBuilder.yml index c6d52268..46e747f3 100644 --- a/recipes/kcalc-nbc/AppImageBuilder.yml +++ b/recipes/kcalc-nbc/AppImageBuilder.yml @@ -37,9 +37,6 @@ AppDir: # exclude glibc for a smaller but non backward compatible bundles - opt/libc - runtime: - version: "continuous" - test: debian: image: appimagecrafters/tests-env:debian-stable @@ -62,3 +59,4 @@ AppImage: update-information: None sign-key: None arch: x86_64 + comp: gzip diff --git a/recipes/kcalc/AppImageBuilder.yml b/recipes/kcalc/AppImageBuilder.yml index e2b87c2a..9adf8cdb 100644 --- a/recipes/kcalc/AppImageBuilder.yml +++ b/recipes/kcalc/AppImageBuilder.yml @@ -41,8 +41,6 @@ AppDir: - usr/share/doc/*/NEWS.* - usr/share/doc/*/TODO.* - usr/share/metainfo/org.kde.kcalc.appdata.xml - runtime: - version: "continuous" test: debian: @@ -66,3 +64,4 @@ AppImage: update-information: None sign-key: None arch: x86_64 + comp: gzip diff --git a/recipes/parole/AppImageBuilder.yml b/recipes/parole/AppImageBuilder.yml index f43cace2..a9be502f 100644 --- a/recipes/parole/AppImageBuilder.yml +++ b/recipes/parole/AppImageBuilder.yml @@ -59,3 +59,4 @@ AppDir: AppImage: arch: x86_64 + comp: gzip diff --git a/recipes/pyqt5/AppImageBuilder.yml b/recipes/pyqt5/AppImageBuilder.yml index 513c838f..4694f882 100644 --- a/recipes/pyqt5/AppImageBuilder.yml +++ b/recipes/pyqt5/AppImageBuilder.yml @@ -36,7 +36,6 @@ AppDir: exclude: [] runtime: - version: "continuous" env: PATH: '${APPDIR}/usr/bin:${PATH}' # Set python home @@ -66,4 +65,5 @@ AppDir: AppImage: update-information: 'gh-releases-zsync|AppImageCrafters|python-appimage-example|latest|python-appimage-*x86_64.AppImage.zsync' sign-key: None - arch: x86_64 \ No newline at end of file + arch: x86_64 + comp: gzip \ No newline at end of file diff --git a/recipes/python/AppImageBuilder.yml b/recipes/python/AppImageBuilder.yml index 9b532257..b9afcd5d 100644 --- a/recipes/python/AppImageBuilder.yml +++ b/recipes/python/AppImageBuilder.yml @@ -29,7 +29,6 @@ AppDir: exclude: [ ] runtime: - version: "continuous" env: EXPORTED_BINARIES: "$APPDIR/usr/bin/env" @@ -54,4 +53,6 @@ AppDir: AppImage: update-information: 'gh-releases-zsync|AppImageCrafters|python-appimage-example|latest|python-appimage-*x86_64.AppImage.zsync' sign-key: None - arch: x86_64 \ No newline at end of file + arch: x86_64 + comp: gzip + \ No newline at end of file diff --git a/recipes/qmlscene/AppImageBuilder.yml b/recipes/qmlscene/AppImageBuilder.yml index 879cb16d..5bcbfab5 100644 --- a/recipes/qmlscene/AppImageBuilder.yml +++ b/recipes/qmlscene/AppImageBuilder.yml @@ -83,4 +83,6 @@ AppDir: AppImage: update-information: None sign-key: None - arch: x86_64 \ No newline at end of file + arch: x86_64 + comp: gzip + \ No newline at end of file diff --git a/recipes/tkinter/AppImageBuilder.yml b/recipes/tkinter/AppImageBuilder.yml index 3db38a74..37021e3f 100644 --- a/recipes/tkinter/AppImageBuilder.yml +++ b/recipes/tkinter/AppImageBuilder.yml @@ -69,4 +69,6 @@ AppDir: AppImage: update-information: 'gh-releases-zsync|AppImageCrafters|python-appimage-example|latest|python-appimage-*x86_64.AppImage.zsync' sign-key: None - arch: x86_64 \ No newline at end of file + arch: x86_64 + comp: gzip + \ No newline at end of file diff --git a/recipes/vlc/AppImageBuilder.yml b/recipes/vlc/AppImageBuilder.yml index d723b69d..e723752e 100644 --- a/recipes/vlc/AppImageBuilder.yml +++ b/recipes/vlc/AppImageBuilder.yml @@ -42,3 +42,4 @@ AppImage: arch: x86_64 update-information: None sign-key: None + comp: gzip diff --git a/recipes/wget/AppImageBuilder.yml b/recipes/wget/AppImageBuilder.yml index 1abda036..401bcd8e 100644 --- a/recipes/wget/AppImageBuilder.yml +++ b/recipes/wget/AppImageBuilder.yml @@ -57,3 +57,4 @@ AppImage: update-information: None sign-key: None file_name: !ENV 'wget-${APP_VERSION}-${TARGET_ARCH}.AppImage' + comp: gzip diff --git a/recipes/wine/AppImageBuilder.yml b/recipes/wine/AppImageBuilder.yml index bc02bd08..4bfe0503 100644 --- a/recipes/wine/AppImageBuilder.yml +++ b/recipes/wine/AppImageBuilder.yml @@ -57,4 +57,5 @@ AppImage: update-information: None sign-key: None arch: x86_64 + comp: gzip