From 30e81961e8425c98b3867bfc18feb4f6e3aa6d8a Mon Sep 17 00:00:00 2001 From: Christopher Davis Date: Tue, 16 Jul 2019 18:51:01 +0000 Subject: [PATCH 1/2] Revert "Flatpak: use the 3.32 runtime version" This reverts commit d8496fe4c41b28076dd94a42e40d1795810b4017 --- .gitlab-ci.yml | 2 +- README.md | 10 +++++++--- org.gnome.Podcasts.Devel.json | 2 +- org.gnome.Podcasts.json | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2bf5186..03c235b 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:3.32" + image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master" stage: "test" variables: MANIFEST_PATH: "org.gnome.Podcasts.Devel.json" diff --git a/README.md b/README.md index df219f6..d13803a 100644 --- a/README.md +++ b/README.md @@ -36,11 +36,15 @@ Flatpak is the recommended way of building and installing GNOME Podcasts. Here are the dependencies you will need. ```sh -# Add flathub repo +# Add flathub and the gnome-nightly 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 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 +# 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 ``` To install the resulting flatpak you can do: diff --git a/org.gnome.Podcasts.Devel.json b/org.gnome.Podcasts.Devel.json index f05ef08..d2e2fa3 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" : "3.32", + "runtime-version" : "master", "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 1b48b1f..7b86efe 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" : "3.32", + "runtime-version" : "master", "sdk" : "org.gnome.Sdk", "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.rust-stable" From d19612bb3ca63c2603d3cf261b1aadbec55c1996 Mon Sep 17 00:00:00 2001 From: Christopher Davis Date: Thu, 3 Oct 2019 20:39:45 -0700 Subject: [PATCH 2/2] README: use new nightly and rust-stable locations freedeskop-sdk is at 19.08 now, and sdk.g.o -> nightly.g.o --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d13803a..17cafab 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,13 @@ Here are the dependencies you will need. ```sh # Add flathub and the gnome-nightly 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 +flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.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 +flatpak install --user flathub org.freedesktop.Sdk.Extension.rust-stable//19.08 ``` To install the resulting flatpak you can do: