From 946d91365c4915291f91ee50232c8f59778701cf Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 6 Oct 2024 19:01:10 -0400 Subject: [PATCH] Move Flatpak manifest to `build-aux` --- .github/workflows/flatpak-builder.yml | 2 +- build-aux/io.github.flattool.Warehouse.json | 57 +++++++++++++++++++++ io.github.flattool.Warehouse.json | 55 -------------------- 3 files changed, 58 insertions(+), 56 deletions(-) create mode 100644 build-aux/io.github.flattool.Warehouse.json delete mode 100644 io.github.flattool.Warehouse.json diff --git a/.github/workflows/flatpak-builder.yml b/.github/workflows/flatpak-builder.yml index ed0b965..aff6284 100644 --- a/.github/workflows/flatpak-builder.yml +++ b/.github/workflows/flatpak-builder.yml @@ -18,4 +18,4 @@ jobs: uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1 with: bundle: io.github.flattool.Warehouse.flatpak - manifest-path: io.github.flattool.Warehouse.json + manifest-path: build-aux/io.github.flattool.Warehouse.json diff --git a/build-aux/io.github.flattool.Warehouse.json b/build-aux/io.github.flattool.Warehouse.json new file mode 100644 index 0000000..5fd0de5 --- /dev/null +++ b/build-aux/io.github.flattool.Warehouse.json @@ -0,0 +1,57 @@ +{ + "id" : "io.github.flattool.Warehouse", + "runtime" : "org.gnome.Platform", + "runtime-version" : "47", + "sdk" : "org.gnome.Sdk", + "command" : "warehouse", + "finish-args" : [ + "--share=ipc", + "--socket=fallback-x11", + "--device=dri", + "--socket=wayland", + "--talk-name=org.freedesktop.Flatpak", + "--filesystem=/var/lib/flatpak/:ro", + "--filesystem=~/.local/share/flatpak/:ro", + "--filesystem=~/.var/app/", + "--filesystem=host-etc" + ], + "cleanup" : [ + "/include", + "/lib/pkgconfig", + "/man", + "/share/doc", + "/share/gtk-doc", + "/share/man", + "/share/pkgconfig", + "*.la", + "*.a" + ], + "modules" : [ + { + "name" : "blueprint-compiler", + "buildsystem" : "meson", + "sources" : [ + { + "type" : "git", + "url" : "https://gitlab.gnome.org/jwestman/blueprint-compiler", + "tag" : "v0.14.0" + } + ], + "cleanup" : [ + "*" + ] + }, + { + "name" : "warehouse", + "builddir" : true, + "buildsystem" : "meson", + "config-opts": [ "-Dprofile=development" ], + "sources" : [ + { + "type" : "dir", + "path" : ".." + } + ] + } + ] +} diff --git a/io.github.flattool.Warehouse.json b/io.github.flattool.Warehouse.json deleted file mode 100644 index a47e93c..0000000 --- a/io.github.flattool.Warehouse.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "id": "io.github.flattool.Warehouse", - "runtime": "org.gnome.Platform", - "runtime-version": "47", - "sdk": "org.gnome.Sdk", - "command": "warehouse", - "finish-args": [ - "--share=ipc", - "--socket=fallback-x11", - "--device=dri", - "--socket=wayland", - "--talk-name=org.freedesktop.Flatpak", - "--filesystem=/var/lib/flatpak/:ro", - "--filesystem=~/.local/share/flatpak/:ro", - "--filesystem=~/.var/app/", - "--filesystem=host-etc" - ], - "cleanup": [ - "/include", - "/lib/pkgconfig", - "/man", - "/share/doc", - "/share/gtk-doc", - "/share/man", - "/share/pkgconfig", - "*.la", - "*.a" - ], - "modules": [ - { - "name": "blueprint-compiler", - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler", - "tag": "v0.14.0" - } - ], - "cleanup": ["*"] - }, - { - "name": "warehouse", - "builddir": true, - "buildsystem": "meson", - "config-opts": ["-Dprofile=default"], - "sources": [ - { - "type": "dir", - "path": "." - } - ] - } - ] -}