mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

ci: Move non-image-tag variables back to .gitlab-ci.yml

Browse source 
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3065#note_1563706

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3068>
This commit is contained in:
Nirbheek Chauhan 2022-09-23 01:08:49 +05:30
parent cabcb56ce8
commit 0e73b36870
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -29,6 +29,16 @@ variables:
# Branch to track for modules that have no ref specified in the manifest # Branch to track for modules that have no ref specified in the manifest
GST_UPSTREAM_BRANCH: 'main' GST_UPSTREAM_BRANCH: 'main'
GST_UPSTREAM_REPO: 'gstreamer/gstreamer'
FDO_UPSTREAM_REPO: 'gstreamer/gstreamer'
FEDORA_AMD64_SUFFIX: 'amd64/fedora'
INDENT_AMD64_SUFFIX: 'amd64/gst-indent'
WINDOWS_AMD64_SUFFIX: 'amd64/windows'
WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH"
WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$GST_UPSTREAM_REPO/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH"
MESON_BUILDTYPE_ARGS: --default-library=both MESON_BUILDTYPE_ARGS: --default-library=both
DEFAULT_MESON_ARGS: > DEFAULT_MESON_ARGS: >
-Dlibnice:tests=disabled -Dlibnice:tests=disabled

10
.gitlab-image-tags.yml
View file

@ -8,13 +8,3 @@ variables:
FEDORA_TAG: '2022-09-22.0' FEDORA_TAG: '2022-09-22.0'
INDENT_TAG: '2022-03-07.1' INDENT_TAG: '2022-03-07.1'
WINDOWS_TAG: "2022-09-17.0" WINDOWS_TAG: "2022-09-17.0"
GST_UPSTREAM_REPO: 'gstreamer/gstreamer'
FDO_UPSTREAM_REPO: 'gstreamer/gstreamer'
FEDORA_AMD64_SUFFIX: 'amd64/fedora'
INDENT_AMD64_SUFFIX: 'amd64/gst-indent'
WINDOWS_AMD64_SUFFIX: 'amd64/windows'
WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH"
WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$GST_UPSTREAM_REPO/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH"