Merge branch 'alatiera/ci-3-32' into 'master'

Flatpak: use the 3.32 runtime version

See merge request World/podcasts!114
This commit is contained in:
Jordan Petridis 2019-07-16 08:05:17 +00:00
commit 1e816f65a5
4 changed files with 6 additions and 10 deletions

View File

@ -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"

View File

@ -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:

View File

@ -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"

View File

@ -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"