From c5699d9b1becbf6f0c0dd8482f94b0fe81e59f0e Mon Sep 17 00:00:00 2001 From: Andy Holmes Date: Wed, 23 Oct 2024 23:38:53 -0700 Subject: [PATCH] ci: update test manifests --- .github/workflows/cd.yml | 6 +- tests/manifests/ca.andyholmes.Flatter1.json | 23 +++ ...Flatter.yml => ca.andyholmes.Flatter2.yml} | 5 +- .../manifests/ca.andyholmes.Valent.Tests.json | 53 ----- tests/manifests/ca.andyholmes.Valent.json | 193 ------------------ tests/manifests/name.ptomato.Bloatpad.json | 39 ---- 6 files changed, 28 insertions(+), 291 deletions(-) create mode 100644 tests/manifests/ca.andyholmes.Flatter1.json rename tests/manifests/{ca.andyholmes.Flatter.yml => ca.andyholmes.Flatter2.yml} (81%) delete mode 100644 tests/manifests/ca.andyholmes.Valent.Tests.json delete mode 100644 tests/manifests/ca.andyholmes.Valent.json delete mode 100644 tests/manifests/name.ptomato.Bloatpad.json diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 198ca2c..c0ca994 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -13,7 +13,7 @@ jobs: name: Flatter runs-on: ubuntu-latest container: - image: ghcr.io/andyholmes/flatter/gnome:46 + image: ghcr.io/andyholmes/flatter/gnome:master options: --privileged strategy: @@ -47,8 +47,8 @@ jobs: uses: andyholmes/flatter@main with: files: | - tests/manifests/ca.andyholmes.Flatter.yml - tests/manifests/name.ptomato.Bloatpad.json + tests/manifests/ca.andyholmes.Flatter1.json + tests/manifests/ca.andyholmes.Flatter2.yml arch: ${{ matrix.arch }} gpg-sign: ${{ steps.gpg.outputs.fingerprint }} upload-bundles: true diff --git a/tests/manifests/ca.andyholmes.Flatter1.json b/tests/manifests/ca.andyholmes.Flatter1.json new file mode 100644 index 0000000..ef3be1b --- /dev/null +++ b/tests/manifests/ca.andyholmes.Flatter1.json @@ -0,0 +1,23 @@ +{ + "app-id": "ca.andyholmes.Flatter1", + "runtime": "org.gnome.Platform", + "runtime-version": "master", + "sdk": "org.gnome.Sdk", + "command": "flatter", + "finish-args": [ + "--device=dri", + "--share=ipc", + "--socket=fallback-x11", + "--socket=wayland" + ], + "modules": [ + { + "name": "flatter", + "buildsystem": "simple", + "build-commands": [ + "mkdir -p /app/bin", + "ln -sf /bin/echo /app/bin/flatter" + ] + } + ] +} diff --git a/tests/manifests/ca.andyholmes.Flatter.yml b/tests/manifests/ca.andyholmes.Flatter2.yml similarity index 81% rename from tests/manifests/ca.andyholmes.Flatter.yml rename to tests/manifests/ca.andyholmes.Flatter2.yml index df322dd..4008fd9 100644 --- a/tests/manifests/ca.andyholmes.Flatter.yml +++ b/tests/manifests/ca.andyholmes.Flatter2.yml @@ -1,8 +1,7 @@ --- -app-id: ca.andyholmes.Flatter -branch: nightly +app-id: ca.andyholmes.Flatter2 runtime: org.gnome.Platform -runtime-version: "46" +runtime-version: "master" sdk: org.gnome.Sdk command: flatter finish-args: diff --git a/tests/manifests/ca.andyholmes.Valent.Tests.json b/tests/manifests/ca.andyholmes.Valent.Tests.json deleted file mode 100644 index 19aa4a3..0000000 --- a/tests/manifests/ca.andyholmes.Valent.Tests.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "name": "ca.andyholmes.Valent.Tests", - "buildsystem": "simple", - "build-commands": [], - "modules" : [ - { - "name" : "dbus-python", - "buildsystem" : "simple", - "build-commands" : [ - "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} dbus-python" - ], - "sources" : [ - { - "type" : "file", - "url" : "https://files.pythonhosted.org/packages/b1/5c/ccfc167485806c1936f7d3ba97db6c448d0089c5746ba105b6eb22dba60e/dbus-python-1.2.18.tar.gz", - "sha256" : "92bdd1e68b45596c833307a5ff4b217ee6929a1502f5341bae28fd120acf7260" - } - ] - }, - { - "name" : "python-dbusmock", - "buildsystem" : "simple", - "build-commands" : [ - "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} python-dbusmock" - ], - "sources" : [ - { - "type" : "file", - "url" : "https://files.pythonhosted.org/packages/78/11/e43401e0729514689d8a724a0a1d81ed2d6e3ae497ad10a06b60113b167e/python-dbusmock-0.28.1.tar.gz", - "sha256" : "6434e544c055e3570b20e341e50a3d2dd50b19d9e55d579b919e14879f9f1e57" - } - ] - }, - { - "name" : "walbottle", - "buildsystem" : "meson", - "builddir" : true, - "config-opts" : [ - "-Dgtk_doc=false", - "-Dinstalled_tests=false", - "-Dintrospection=disabled", - "-Dwerror=false" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://gitlab.com/walbottle/walbottle.git", - "branch" : "main" - } - ] - } - ] -} diff --git a/tests/manifests/ca.andyholmes.Valent.json b/tests/manifests/ca.andyholmes.Valent.json deleted file mode 100644 index f287851..0000000 --- a/tests/manifests/ca.andyholmes.Valent.json +++ /dev/null @@ -1,193 +0,0 @@ -{ - "app-id" : "ca.andyholmes.Valent", - "runtime" : "org.gnome.Platform", - "runtime-version" : "46", - "sdk" : "org.gnome.Sdk", - "command" : "valent", - "finish-args" : [ - "--device=dri", - "--env=PULSE_PROP_media.category=Manager", - "--filesystem=xdg-download", - "--filesystem=xdg-run/gvfsd", - "--own-name=org.mpris.MediaPlayer2.Valent", - "--share=ipc", - "--share=network", - "--socket=fallback-x11", - "--socket=pulseaudio", - "--socket=session-bus", - "--socket=ssh-auth", - "--socket=wayland", - "--system-talk-name=org.freedesktop.hostname1", - "--system-talk-name=org.freedesktop.login1", - "--system-talk-name=org.freedesktop.ModemManager1", - "--system-talk-name=org.freedesktop.UPower", - "--talk-name=org.a11y.Bus", - "--talk-name=org.freedesktop.DBus", - "--talk-name=org.gnome.evolution.dataserver.AddressBook10", - "--talk-name=org.gnome.evolution.dataserver.Sources5", - "--talk-name=org.gnome.evolution.dataserver.Subprocess.Backend.*", - "--talk-name=org.gnome.OnlineAccounts", - "--talk-name=org.gtk.vfs.*", - "--talk-name=org.mpris.MediaPlayer2.*" - ], - "add-extensions" : { - "ca.andyholmes.Valent.Plugin" : { - "version" : "stable", - "directory" : "extensions", - "add-ld-path" : "lib", - "merge-dirs" : "lib/valent/plugins", - "subdirectories" : true, - "no-autodownload" : true, - "autodelete" : true - } - }, - "cleanup" : [ - "/libexec", - "/man", - "/share/man", - "*.la", - "*.a" - ], - "modules" : [ - { - "name" : "intltool", - "cleanup" : [ - "*" - ], - "sources" : [ - { - "type" : "archive", - "url" : "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz", - "sha256" : "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd" - } - ] - }, - { - "name" : "libical", - "buildsystem" : "cmake-ninja", - "cleanup" : [ - "/lib/cmake" - ], - "config-opts" : [ - "-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib", - "-DBUILD_SHARED_LIBS:BOOL=ON", - "-DGOBJECT_INTROSPECTION:BOOL=ON", - "-DICAL_BUILD_DOCS:BOOL=OFF", - "-DICAL_GLIB_VAPI:BOOL=OFF", - "-DICAL_GLIB:BOOL=ON" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://github.com/libical/libical.git", - "commit" : "098fb68688b853410daed96812a6fe0a22e0e15f", - "tag" : "v3.0.14" - } - ] - }, - { - "name" : "evolution-data-server", - "buildsystem" : "cmake-ninja", - "cleanup" : [ - "/etc", - "/lib/cmake", - "/lib/evolution-data-server/*-backends", - "/libexec", - "/share/applications", - "/share/dbus-1/services", - "/share/GConf", - "/systemd" - ], - "config-opts" : [ - "-DCMAKE_BUILD_TYPE=Release", - "-DENABLE_DOT_LOCKING=OFF", - "-DENABLE_CANBERRA=OFF", - "-DENABLE_GTK=OFF", - "-DENABLE_GOA=OFF", - "-DENABLE_GOOGLE=OFF", - "-DENABLE_VALA_BINDINGS=OFF", - "-DENABLE_WEATHER=OFF", - "-DWITH_OPENLDAP=OFF", - "-DWITH_LIBDB=OFF", - "-DENABLE_INTROSPECTION=ON", - "-DENABLE_INSTALLED_TESTS=OFF", - "-DENABLE_GTK_DOC=OFF", - "-DENABLE_EXAMPLES=OFF", - "-DWITH_SYSTEMDUSERUNITDIR=OFF", - "-DWITH_DBUS_SERVICE_DIR=OFF" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://gitlab.gnome.org/GNOME/evolution-data-server.git", - "commit" : "ed45e3272a88ea9097a4fe25b5d6bfed4e1272ce", - "tag" : "3.46.0" - } - ] - }, - { - "name" : "libpeas", - "buildsystem" : "meson", - "builddir" : true, - "cleanup" : [ - "/bin/*", - "/lib/peas-demo", - "/lib/libpeas-gtk*", - "/share/icons" - ], - "config-opts" : [ - "-Dpython3=true", - "-Dintrospection=true", - "-Ddemos=false", - "-Dglade_catalog=false", - "-Dwidgetry=false" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://gitlab.gnome.org/GNOME/libpeas.git", - "commit" : "744e16bdada0eb79c37abac328cb4c3dc6dd42df", - "tag" : "libpeas-1.34.0" - } - ] - }, - { - "name" : "libportal", - "buildsystem" : "meson", - "builddir" : true, - "config-opts" : [ - "-Dbackends=gtk4", - "-Ddocs=false", - "-Dintrospection=false", - "-Dvapi=false" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://github.com/flatpak/libportal.git", - "commit" : "13df0b887a7eb7b0f9b14069561a41f62e813155", - "tag" : "0.6" - } - ] - }, - { - "name" : "valent", - "buildsystem" : "meson", - "builddir" : true, - "config-opts" : [ - "--prefix=/app", - "--buildtype=release" - ], - "post-install" : [ - "install -d /app/extensions" - ], - "sources" : [ - { - "type" : "git", - "url" : "https://github.com/andyholmes/valent.git", - "branch" : "main" - } - ] - } - ] -} diff --git a/tests/manifests/name.ptomato.Bloatpad.json b/tests/manifests/name.ptomato.Bloatpad.json deleted file mode 100644 index 4c07ee8..0000000 --- a/tests/manifests/name.ptomato.Bloatpad.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "app-id": "name.ptomato.Bloatpad", - "runtime": "org.gnome.Platform", - "runtime-version": "46", - "sdk": "org.gnome.Sdk", - "command": "name.ptomato.Bloatpad", - "finish-args": [ - "--share=ipc", - "--device=dri", - "--socket=fallback-x11", - "--socket=wayland" - ], - "cleanup": [ - "/include", - "/lib/pkgconfig", - "/man", - "/share/doc", - "/share/gtk-doc", - "/share/man", - "/share/pkgconfig", - "*.la", - "*.a" - ], - "modules": [ - { - "name": "bloatpad", - "builddir": true, - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/ptomato/bloatpad.git", - "branch": "main" - } - ] - } - ] -} -