From d8a1b2b4a5df44bec99bde9f3c9bc0e3713549cb Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce@bcowan.me.uk>
Date: Thu, 24 Mar 2022 13:44:05 +0000
Subject: [PATCH] Use GNOME 42 SDK
---
.gitlab-ci.yml | 6 +++---
build-aux/uk.me.bcowan.Rugby.yml | 2 +-
data/interface.ui | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ee23c2f..9c8e4a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,9 +13,9 @@ flatpak:
script:
- apk update && apk add flatpak-builder
- - flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
- - flatpak install -y flathub org.gnome.Platform master
- - flatpak install -y flathub org.gnome.Sdk master
+ - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+ - flatpak install -y flathub org.gnome.Platform 42
+ - flatpak install -y flathub org.gnome.Sdk 42
- flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
- flatpak build app meson --prefix=/app ${MESON_ARGS} _build
- flatpak build app ninja -C _build install
diff --git a/build-aux/uk.me.bcowan.Rugby.yml b/build-aux/uk.me.bcowan.Rugby.yml
index f904abb..016f8db 100644
--- a/build-aux/uk.me.bcowan.Rugby.yml
+++ b/build-aux/uk.me.bcowan.Rugby.yml
@@ -4,7 +4,7 @@
app-id: uk.me.bcowan.Rugby
runtime: org.gnome.Platform
-runtime-version: "master"
+runtime-version: "42"
sdk: org.gnome.Sdk
command: rugby
diff --git a/data/interface.ui b/data/interface.ui
index 5f4e286..42bd470 100644
--- a/data/interface.ui
+++ b/data/interface.ui
@@ -26,7 +26,7 @@
<property name="default-height">600</property>
<property name="default-width">400</property>
<style>
- <class name="devel"/>
+ <class name="devel"/>
</style>
<child>
<object class="GtkScrolledWindow">
--
GitLab