From 19750e92a9991269c4b6be2cd33f0dcbf267ebde Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce@bcowan.me.uk>
Date: Sun, 24 Mar 2024 19:32:19 +0000
Subject: [PATCH] Swap from YAML to JSON for flatpak config
gnome-builder doesn't support YAML
---
.gitlab-ci.yml | 2 +-
uk.me.bcowan.Rugby.json | 40 +++++++++++++++++++++++++++++++++
uk.me.bcowan.Rugby.json.license | 3 +++
uk.me.bcowan.Rugby.yml | 31 -------------------------
4 files changed, 44 insertions(+), 32 deletions(-)
create mode 100644 uk.me.bcowan.Rugby.json
create mode 100644 uk.me.bcowan.Rugby.json.license
delete mode 100644 uk.me.bcowan.Rugby.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40ea21e..c8980bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ flatpak:
image: alpine:latest
stage: build
variables:
- MANIFEST_PATH: "uk.me.bcowan.Rugby.yml"
+ MANIFEST_PATH: "uk.me.bcowan.Rugby.json"
RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
FLATPAK_MODULE: "rugby"
BUNDLE: "rugby.flatpak"
diff --git a/uk.me.bcowan.Rugby.json b/uk.me.bcowan.Rugby.json
new file mode 100644
index 0000000..0df75ca
--- /dev/null
+++ b/uk.me.bcowan.Rugby.json
@@ -0,0 +1,40 @@
+{
+ "app-id": "uk.me.bcowan.Rugby",
+ "runtime": "org.gnome.Platform",
+ "runtime-version": "master",
+ "sdk": "org.gnome.Sdk",
+ "command": "rugby",
+ "finish-args": [
+ "--share=ipc",
+ "--device=dri",
+ "--socket=fallback-x11",
+ "--socket=wayland"
+ ],
+ "modules": [
+ {
+ "name": "blueprint-compiler",
+ "buildsystem": "meson",
+ "sources": [
+ {
+ "type": "git",
+ "url": "https://gitlab.gnome.org/jwestman/blueprint-compiler",
+ "tag": "v0.10.0"
+ }
+ ]
+ },
+ {
+ "name": "rugby",
+ "buildsystem": "meson",
+ "builddir": true,
+ "sources": [
+ {
+ "type": "dir",
+ "path": "."
+ }
+ ],
+ "config_opts": [
+ "-Dprofile=development"
+ ]
+ }
+ ]
+}
diff --git a/uk.me.bcowan.Rugby.json.license b/uk.me.bcowan.Rugby.json.license
new file mode 100644
index 0000000..6e1605f
--- /dev/null
+++ b/uk.me.bcowan.Rugby.json.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2024 Bruce Cowan <bruce@bcowan.me.uk>
+
+SPDX-License-Identifier: GPL-3.0-or-later
diff --git a/uk.me.bcowan.Rugby.yml b/uk.me.bcowan.Rugby.yml
deleted file mode 100644
index a41a3c1..0000000
--- a/uk.me.bcowan.Rugby.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-# SPDX-FileCopyrightText: 2018-2023 Bruce Cowan <bruce@bcowan.me.uk>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-app-id: uk.me.bcowan.Rugby
-runtime: org.gnome.Platform
-runtime-version: "master"
-sdk: org.gnome.Sdk
-command: rugby
-
-finish-args:
- - "--share=ipc"
- - "--device=dri"
- - "--socket=fallback-x11"
- - "--socket=wayland"
-
-modules:
- - name: blueprint-compiler
- buildsystem: meson
- sources:
- - type: git
- url: https://gitlab.gnome.org/jwestman/blueprint-compiler
- tag: v0.10.0
- - name: rugby
- buildsystem: meson
- builddir: true
- sources:
- - type: dir
- path: .
- config_opts:
- - "-Dprofile=development"
--
GitLab