From d8496fe4c41b28076dd94a42e40d1795810b4017 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Tue, 16 Jul 2019 10:30:06 +0300 Subject: [PATCH] Flatpak: use the 3.32 runtime version Until somebody find time to fix the CI image to work with the 19.08 fd.o base. --- .gitlab-ci.yml | 2 +- README.md | 10 +++------- org.gnome.Podcasts.Devel.json | 2 +- org.gnome.Podcasts.json | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03c235b..2bf5186 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ variables: BUNDLE: "org.gnome.Podcasts.Devel.flatpak" flatpak: - image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master" + image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:3.32" stage: "test" variables: MANIFEST_PATH: "org.gnome.Podcasts.Devel.json" diff --git a/README.md b/README.md index d13803a..df219f6 100644 --- a/README.md +++ b/README.md @@ -36,15 +36,11 @@ Flatpak is the recommended way of building and installing GNOME Podcasts. Here are the dependencies you will need. ```sh -# Add flathub and the gnome-nightly repo +# Add flathub repo flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo -flatpak remote-add --user --if-not-exists gnome-nightly https://sdk.gnome.org/gnome-nightly.flatpakrepo -# Install the gnome-nightly Sdk and Platform runtime -flatpak install --user gnome-nightly org.gnome.Sdk org.gnome.Platform - -# Install the required rust-stable extension from flathub -flatpak install --user flathub org.freedesktop.Sdk.Extension.rust-stable//18.08 +# Install the Nightly Sdk and Platform GNOME runtime and the rust Sdk extension +flatpak install --user org.gnome.Sdk//3.32 org.gnome.Platform//3.32 org.freedesktop.Sdk.Extension.rust-stable//18.08 ``` To install the resulting flatpak you can do: diff --git a/org.gnome.Podcasts.Devel.json b/org.gnome.Podcasts.Devel.json index 495da16..ef283d1 100644 --- a/org.gnome.Podcasts.Devel.json +++ b/org.gnome.Podcasts.Devel.json @@ -1,7 +1,7 @@ { "app-id" : "org.gnome.Podcasts.Devel", "runtime" : "org.gnome.Platform", - "runtime-version" : "master", + "runtime-version" : "3.32", "sdk" : "org.gnome.Sdk", "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.rust-stable" diff --git a/org.gnome.Podcasts.json b/org.gnome.Podcasts.json index 689ec25..9e8e9f4 100644 --- a/org.gnome.Podcasts.json +++ b/org.gnome.Podcasts.json @@ -1,7 +1,7 @@ { "app-id" : "org.gnome.Podcasts", "runtime" : "org.gnome.Platform", - "runtime-version" : "master", + "runtime-version" : "3.32", "sdk" : "org.gnome.Sdk", "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.rust-stable"