[pitivi/sdk] build: Update flatpak SDK
- From: Alexandru Băluț <alexbalut src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi/sdk] build: Update flatpak SDK
- Date: Thu, 11 Apr 2019 20:11:02 +0000 (UTC)
commit c8b474640954bc6cc5b5ddcf2225124139f733e5
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Tue Mar 26 07:19:32 2019 +0100
build: Update flatpak SDK
.gitlab-ci.yml | 10 +++++-----
build/flatpak/org.pitivi.Pitivi.json | 2 +-
docs/Bug_reporting.md | 2 +-
docs/Install_with_flatpak.md | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3f2efef..4073b33d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
XUNIT_PATH: ${CI_PROJECT_DIR}/xunit.xml
build:
- image: registry.gitlab.gnome.org/gnome/pitivi:master-sdk_3.30
+ image: registry.gitlab.gnome.org/gnome/pitivi:master-sdk_3.32
stage: build
artifacts:
paths:
@@ -51,7 +51,7 @@ deploy:
only:
- master@GNOME/pitivi
- 1.0@GNOME/pitivi
- - thiblahute/sdk3.30@GNOME/pitivi
+ - thiblahute/sdk3.32@GNOME/pitivi
# Not using a Dockerfile because we need the container to be privileged to run flatpak inside of it
# and it is not possible to use a privileged `docker build`.
@@ -60,9 +60,9 @@ deploy:
services:
- docker:dind
script:
- - export IMAGE="${CI_REGISTRY}/${NAMESPACE}/${CI_PROJECT_NAME}:${BRANCH}-sdk_3.30"
- - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30"
- - export TMPIMAGENAME="tmp-pitivi-${BRANCH}-sdk_3.30"
+ - export IMAGE="${CI_REGISTRY}/${NAMESPACE}/${CI_PROJECT_NAME}:${BRANCH}-sdk_3.32"
+ - export BASE_IMAGE="registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.32"
+ - export TMPIMAGENAME="tmp-pitivi-${BRANCH}-sdk_3.32"
- export RUN_IN_SANDBOX="flatpak-builder --filesystem=${BUILDDIR} --filesystem=${CI_PROJECT_DIR}
--env=PITIVI_DEVELOPMENT=1 --run app ${MANIFEST}"
- export BUILDDIR="\${HOME}/pitivi"
- export CLONE_PITIVI="git clone ${CI_PROJECT_URL}.git --single-branch \${HOME}/pitivi -b
${CI_COMMIT_REF_NAME}"
diff --git a/build/flatpak/org.pitivi.Pitivi.json b/build/flatpak/org.pitivi.Pitivi.json
index ed72f75f..413fc9d2 100644
--- a/build/flatpak/org.pitivi.Pitivi.json
+++ b/build/flatpak/org.pitivi.Pitivi.json
@@ -2,7 +2,7 @@
"app-id": "org.pitivi.Pitivi",
"branch": "master",
"runtime": "org.gnome.Platform",
- "runtime-version": "3.30",
+ "runtime-version": "3.32",
"command": "pitivi",
"finish-args": [
"--socket=x11",
diff --git a/docs/Bug_reporting.md b/docs/Bug_reporting.md
index b57065e2..d763a661 100644
--- a/docs/Bug_reporting.md
+++ b/docs/Bug_reporting.md
@@ -99,7 +99,7 @@ gdb python3 -ex "run $PITIVI_REPO_DIR/bin/pitivi"
1. Make sure you have the GNOME Sdk and Debug symbols installed:
```
-GNOME_REPO=$(flatpak info org.gnome.Platform//3.24 | grep Origin | awk '{ print $2 }')
+GNOME_REPO=$(flatpak info org.gnome.Platform//3.32 | grep Origin | awk '{ print $2 }')
for i in $(flatpak list | grep org.pitivi.Pitivi/ | awk '{ print $1 }'); do
flatpak install --user $GNOME_REPO $(flatpak info $i |grep Runtime |awk '{ print $2 }' |sed
s/Platform/Sdk/)
flatpak update --user $(flatpak info $i |grep Runtime |awk '{ print $2 }' |sed s/Platform/Sdk/)
diff --git a/docs/Install_with_flatpak.md b/docs/Install_with_flatpak.md
index ad239868..df5294d8 100644
--- a/docs/Install_with_flatpak.md
+++ b/docs/Install_with_flatpak.md
@@ -36,7 +36,7 @@ $ flatpak install flathub org.pitivi.Pitivi
```
$ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-$ flatpak install flathub org.gnome.Platform//3.28
+$ flatpak install flathub org.gnome.Platform//3.32
$ flatpak install http://flatpak.pitivi.org/pitivi.flatpakref
```
@@ -44,7 +44,7 @@ $ flatpak install http://flatpak.pitivi.org/pitivi.flatpakref
```
$ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-$ flatpak install flathub org.gnome.Platform//3.28
+$ flatpak install flathub org.gnome.Platform//3.32
$ flatpak install http://flatpak.pitivi.org/pitivi-master.flatpakref
```
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]