mirror of
https://gitlab.freedesktop.org/dabrain34/GstPipelineStudio.git
synced 2024-09-27 22:11:57 +00:00
ci: fix flatpak release job
This commit is contained in:
parent
1aa39f2c62
commit
e0274e8fd6
2 changed files with 46 additions and 19 deletions
|
@ -12,7 +12,7 @@ stages:
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
FDO_UPSTREAM_REPO: "dabrain34/GstPipelineStudio"
|
FDO_UPSTREAM_REPO: "dabrain34/GstPipelineStudio"
|
||||||
GNOME_RUNTIME_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:41"
|
GNOME_RUNTIME_IMAGE: 'quay.io/gnome_infrastructure/gnome-runtime-images:gnome-44'
|
||||||
WINDOWS_RUST_STABLE_IMAGE: "$CI_REGISTRY_IMAGE/windows:$GST_RS_IMG_TAG-main-$GST_RS_STABLE"
|
WINDOWS_RUST_STABLE_IMAGE: "$CI_REGISTRY_IMAGE/windows:$GST_RS_IMG_TAG-main-$GST_RS_STABLE"
|
||||||
WINDOWS_RUST_STABLE_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows:$GST_RS_IMG_TAG-main-$GST_RS_STABLE"
|
WINDOWS_RUST_STABLE_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/windows:$GST_RS_IMG_TAG-main-$GST_RS_STABLE"
|
||||||
|
|
||||||
|
@ -179,19 +179,11 @@ dist-package:
|
||||||
|
|
||||||
flatpak:
|
flatpak:
|
||||||
image: $GNOME_RUNTIME_IMAGE
|
image: $GNOME_RUNTIME_IMAGE
|
||||||
stage: release
|
stage: test
|
||||||
only:
|
|
||||||
- flatpak
|
|
||||||
- tags
|
|
||||||
# Using gstreamer runner avoids an issue with 'bwrap: No permissions to creating new namespace' during flatpak builder
|
|
||||||
tags:
|
|
||||||
- gstreamer
|
|
||||||
variables:
|
variables:
|
||||||
BUNDLE: "gst-pipeline-studio-nightly.flatpak"
|
|
||||||
MANIFEST_PATH: "build-aux/org.freedesktop.dabrain34.GstPipelineStudio.Devel.json"
|
MANIFEST_PATH: "build-aux/org.freedesktop.dabrain34.GstPipelineStudio.Devel.json"
|
||||||
FLATPAK_MODULE: "gst-pipeline-studio"
|
|
||||||
APP_ID: "org.freedesktop.dabrain34.GstPipelineStudio.Devel"
|
APP_ID: "org.freedesktop.dabrain34.GstPipelineStudio.Devel"
|
||||||
RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo"
|
BUNDLE: "gst-pipeline-studio-nightly.flatpak"
|
||||||
script:
|
script:
|
||||||
- flatpak-builder app ${MANIFEST_PATH}
|
- flatpak-builder app ${MANIFEST_PATH}
|
||||||
- flatpak build-export repo app
|
- flatpak build-export repo app
|
||||||
|
@ -202,6 +194,13 @@ flatpak:
|
||||||
when: "always"
|
when: "always"
|
||||||
paths:
|
paths:
|
||||||
- "${BUNDLE}"
|
- "${BUNDLE}"
|
||||||
- ".flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/meson-log.txt"
|
|
||||||
- ".flatpak-builder/build/${FLATPAK_MODULE}/_flatpak_build/meson-logs/testlog.txt"
|
|
||||||
expire_in: 14 days
|
expire_in: 14 days
|
||||||
|
cache:
|
||||||
|
key: "flatpak"
|
||||||
|
paths:
|
||||||
|
- .flatpak-builder/downloads/
|
||||||
|
- .flatpak-builder/git/
|
||||||
|
- target/
|
||||||
|
- target_test/
|
||||||
|
when: 'manual'
|
||||||
|
|
||||||
|
|
|
@ -1,28 +1,56 @@
|
||||||
{
|
{
|
||||||
"app-id": "org.freedesktop.dabrain34.GstPipelineStudio.Devel",
|
"app-id": "org.freedesktop.dabrain34.GstPipelineStudio.Devel",
|
||||||
"runtime": "org.gnome.Platform",
|
"runtime": "org.gnome.Platform",
|
||||||
"runtime-version": "41",
|
"runtime-version": "44",
|
||||||
"sdk": "org.gnome.Sdk",
|
"sdk": "org.gnome.Sdk",
|
||||||
"sdk-extensions": ["org.freedesktop.Sdk.Extension.rust-stable"],
|
"sdk-extensions": [
|
||||||
|
"org.freedesktop.Sdk.Extension.rust-stable"
|
||||||
|
],
|
||||||
"command": "gst_pipeline_studio",
|
"command": "gst_pipeline_studio",
|
||||||
"finish-args": [
|
"finish-args": [
|
||||||
"--socket=fallback-x11",
|
"--socket=fallback-x11",
|
||||||
"--socket=wayland",
|
"--socket=wayland",
|
||||||
"--device=dri",
|
"--device=dri",
|
||||||
|
"--share=ipc",
|
||||||
|
"--share=network",
|
||||||
|
"--filesystem=home",
|
||||||
"--env=G_MESSAGES_DEBUG=none",
|
"--env=G_MESSAGES_DEBUG=none",
|
||||||
"--env=RUST_BACKTRACE=1"
|
"--env=RUST_BACKTRACE=1"
|
||||||
],
|
],
|
||||||
"build-options": {
|
"build-options": {
|
||||||
"append-path": "/usr/lib/sdk/rust-stable/bin",
|
"append-path": "/usr/lib/sdk/rust-stable/bin",
|
||||||
"build-args": ["--share=network"],
|
"build-args": [
|
||||||
"test-args": ["--socket=x11", "--share=network"]
|
"--share=network"
|
||||||
|
],
|
||||||
|
"test-args": [
|
||||||
|
"--socket=x11",
|
||||||
|
"--share=network"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"modules": [
|
"modules": [
|
||||||
|
{
|
||||||
|
"name": "gstreamer",
|
||||||
|
"buildsystem": "meson",
|
||||||
|
"builddir": true,
|
||||||
|
"config-opts": [
|
||||||
|
"-Ddoc=disabled"
|
||||||
|
],
|
||||||
|
"sources": [
|
||||||
|
{
|
||||||
|
"type": "git",
|
||||||
|
"tag": "1.22",
|
||||||
|
"url": "https://gitlab.freedesktop.org/gstreamer/gstreamer.git",
|
||||||
|
"disable-submodules": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "gst_pipeline_studio",
|
"name": "gst_pipeline_studio",
|
||||||
"buildsystem": "meson",
|
"buildsystem": "meson",
|
||||||
"run-tests": true,
|
"run-tests": true,
|
||||||
"config-opts": ["-Dprofile=development"],
|
"config-opts": [
|
||||||
|
"-Dprofile=development"
|
||||||
|
],
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"type": "dir",
|
"type": "dir",
|
||||||
|
|
Loading…
Reference in a new issue