toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'revert-d8496fe4' into 'master'

Browse Source 
Revert "Flatpak: use the 3.32 runtime version"

See merge request World/podcasts!115
This commit is contained in:
Jordan Petridis 2019-10-04 12:28:24 +00:00
commit a1f1cddcbe
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -7,7 +7,7 @@ variables:
BUNDLE: "org.gnome.Podcasts.Devel.flatpak" BUNDLE: "org.gnome.Podcasts.Devel.flatpak"
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" stage: "test"
variables: variables:
MANIFEST_PATH: "org.gnome.Podcasts.Devel.json" MANIFEST_PATH: "org.gnome.Podcasts.Devel.json"

10
README.md
View File

@ -36,11 +36,15 @@ Flatpak is the recommended way of building and installing GNOME Podcasts.
Here are the dependencies you will need. Here are the dependencies you will need.
```sh ```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 flathub https://dl.flathub.org/repo/flathub.flatpakrepo
flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
# Install the Nightly Sdk and Platform GNOME runtime and the rust Sdk extension # Install the gnome-nightly Sdk and Platform runtime
flatpak install --user org.gnome.Sdk//3.32 org.gnome.Platform//3.32 org.freedesktop.Sdk.Extension.rust-stable//18.08 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//19.08
``` ```
To install the resulting flatpak you can do: To install the resulting flatpak you can do:

2
org.gnome.Podcasts.Devel.json
View File

@ -1,7 +1,7 @@
{ {
"app-id" : "org.gnome.Podcasts.Devel", "app-id" : "org.gnome.Podcasts.Devel",
"runtime" : "org.gnome.Platform", "runtime" : "org.gnome.Platform",
"runtime-version" : "3.32", "runtime-version" : "master",
"sdk" : "org.gnome.Sdk", "sdk" : "org.gnome.Sdk",
"sdk-extensions" : [ "sdk-extensions" : [
"org.freedesktop.Sdk.Extension.rust-stable" "org.freedesktop.Sdk.Extension.rust-stable"

2
org.gnome.Podcasts.json
View File

@ -1,7 +1,7 @@
{ {
"app-id" : "org.gnome.Podcasts", "app-id" : "org.gnome.Podcasts",
"runtime" : "org.gnome.Platform", "runtime" : "org.gnome.Platform",
"runtime-version" : "3.32", "runtime-version" : "master",
"sdk" : "org.gnome.Sdk", "sdk" : "org.gnome.Sdk",
"sdk-extensions" : [ "sdk-extensions" : [
"org.freedesktop.Sdk.Extension.rust-stable" "org.freedesktop.Sdk.Extension.rust-stable"