mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-05-16 15:32:58 +00:00
Code Issues Projects Releases Wiki Activity

ci: Make sure to always update subprojects

Browse source 
The command was not run in Windows jobs, better keep subprojects
handling in a single script.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2509>
This commit is contained in:
Xavier Claessens 2022-05-27 09:37:41 -04:00 committed by GStreamer Marge Bot
parent 7c8902c983
commit ea990ff817
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -210,8 +210,6 @@ gst indent:
#
.build_template: &build
- ci/scripts/handle-subprojects-cache.py subprojects/
# Update subprojects to respect `.wrap` content
- meson subprojects update --reset
- echo $MESON_ARGS
- meson build/ $MESON_ARGS
- ninja -C build/

2
ci/scripts/handle-subprojects-cache.py
View file

@ -8,6 +8,7 @@ import shutil
import os
import sys
import argparse
import subprocess
DEST = "/subprojects"
PARSER = argparse.ArgumentParser()
@ -69,6 +70,7 @@ def copy_cache(options):
print("Copying from %s -> %s" % (cache_dir, project_path))
shutil.copytree(cache_dir, project_path)
subprocess.check_call(['meson', 'subprojects', 'update', '--reset'])
if __name__ == "__main__":