diff options
| author | Jordan Petridis <jordan@centricular.com> | 2020-12-16 17:23:15 +0200 |
|---|---|---|
| committer | Jordan Petridis <jordan@centricular.com> | 2021-02-25 03:32:58 +0200 |
| commit | 1f0b3938af243fce1bfa8095ffed9228748d384a (patch) | |
| tree | 8ab82d23806ebc743d31548c24cfc7e34a87fb2b | |
| parent | 2c0ab5f8a1756c5a2c8d1e192dcd87da6c9dba48 (diff) | |
ci_template: use meson subproject --rebase for the windows builds as well
Similar to !375
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/382>
| -rw-r--r-- | gitlab/ci_template.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index 6924fe2..bfc9044 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -793,9 +793,17 @@ valgrind ges: - python clone_manifest_ref.py --manifest manifest.xml --project gst-build --destination $env:CI_PROJECT_DIR/gst-build - cd $env:CI_PROJECT_DIR/gst-build + # Update meson + # FIXME: remove this once the windows image is rebuilt/updated + - pip install -U meson==0.56.2 + - cp -r C:/subprojects/* subprojects/ + - cd $env:CI_PROJECT_DIR/gst-build + # Reset the subprojects to invalidate the cache if needed + - meson subprojects update --reset # Run the git-update script and feed it the manifest to setup the environment - - cd $env:CI_PROJECT_DIR/gst-build; python git-update --no-interaction --manifest=$env:CI_PROJECT_DIR/manifest.xml + - python git-update --no-interaction --manifest=$env:CI_PROJECT_DIR/manifest.xml + # For some reason, options are separated by newline instead of space, so we # have to replace them first. - $env:MESON_ARGS = $env:MESON_ARGS.replace("`n"," ") |