[gnome-build-meta/abderrahim/openh264: 2/3] .gitlab-ci.yml: publish the new openh264 extension to the nightly repo
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/openh264: 2/3] .gitlab-ci.yml: publish the new openh264 extension to the nightly repo
- Date: Fri, 15 Nov 2019 20:53:33 +0000 (UTC)
commit 6caee0861d16a6115c4e2db31797baab60df4cfb
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Fri Nov 15 21:51:21 2019 +0100
.gitlab-ci.yml: publish the new openh264 extension to the nightly repo
.gitlab-ci.yml | 9 +++++++++
elements/flatpak-platform-extensions.bst | 3 ++-
elements/openh264-extension.bst | 6 ++++++
junction.refs | 2 ++
4 files changed, 19 insertions(+), 1 deletion(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b65a1728..eb25fcff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,6 +97,7 @@ default:
script:
- ${BST} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build core.bst flatpak-runtimes.bst
flatpak-platform-extensions.bst platform-manifest.bst sdk-manifest.bst
+ openh264-extension.bst:flatpak-repo.bst
- |
# Only run this build for x86_64, instead of building it somewhere else
if [ "${ARCH}" == "x86_64" ]; then
@@ -150,6 +151,14 @@ default:
rm -rf checkout-repo/
fi
+ - |
+ if test $FLAT_MANAGER_REPO == nightly -a $ARCH == x86_64; then
+ ${BST} -o arch "${ARCH}" pull openh264-extension.bst:flatpak-repo.bst
+ ${BST} -o arch "${ARCH}" checkout --hardlinks openh264-extension.bst:flatpak-repo.bst checkout-repo/
+ flatpak build-commit-from --src-repo=checkout-repo/ repo/
+ rm -rf checkout-repo/
+ fi
+
- flatpak build-update-repo --generate-static-deltas repo/
- flat-manager/flat-manager-client push $(cat build.txt) repo/
diff --git a/elements/flatpak-platform-extensions.bst b/elements/flatpak-platform-extensions.bst
index d454291a..e33ffdbb 100644
--- a/elements/flatpak-platform-extensions.bst
+++ b/elements/flatpak-platform-extensions.bst
@@ -1,9 +1,10 @@
kind: flatpak_repo
+
build-depends:
- freedesktop-sdk.bst:deploy-tools/flatpak.bst
- freedesktop-sdk.bst:flatpak-images/mesa.bst
-- freedesktop-sdk.bst:flatpak-images/platform-openh264-conditional.bst
- freedesktop-sdk.bst:flatpak-images/platform-vaapi.bst
+
variables:
# Obtain the versions of the flatpak extensions
(@): freedesktop-sdk.bst:include/_private/versions.yml
diff --git a/elements/openh264-extension.bst b/elements/openh264-extension.bst
new file mode 100644
index 00000000..81cf8d76
--- /dev/null
+++ b/elements/openh264-extension.bst
@@ -0,0 +1,6 @@
+kind: junction
+
+sources:
+- kind: git_tag
+ url: https://gitlab.com/coldtom/openh264-extension.git
+ track: master
diff --git a/junction.refs b/junction.refs
index 00b4a62f..56617c58 100644
--- a/junction.refs
+++ b/junction.refs
@@ -2,3 +2,5 @@ projects:
gnome:
freedesktop-sdk.bst:
- ref: freedesktop-sdk-19.08.3-0-g816a8ddf806ff686d3cfbd69463e8b59f6b5720f
+ openh264-extension.bst:
+ - ref: 69d6b7be4dab740e34fe7179da6a2f6e5e384352
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]