diff options
| author | Jordan Petridis <jordan@centricular.com> | 2020-10-30 18:02:23 +0200 |
|---|---|---|
| committer | Jordan Petridis <jordan@centricular.com> | 2020-11-17 13:59:37 +0200 |
| commit | b6209cb132428e0765587940d73efec1e3ed4180 (patch) | |
| tree | 48e7789ed1448ea39936841fef5346f14d73b2ba | |
| parent | b0f5da226a996846bc4cb7b863009fa225c696dc (diff) | |
citemplate: use meson 0.56 and suproject update --reset
Close #73 #74 #75
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/378>
| -rw-r--r-- | docker/fedora/prepare.sh | 2 | ||||
| -rw-r--r-- | gitlab/ci_template.yml | 18 |
2 files changed, 16 insertions, 4 deletions
diff --git a/docker/fedora/prepare.sh b/docker/fedora/prepare.sh index 1024be6..bdfd1ee 100644 --- a/docker/fedora/prepare.sh +++ b/docker/fedora/prepare.sh @@ -184,7 +184,7 @@ dnf debuginfo-install -y gtk3 \ zip \ zlib -pip3 install meson==0.54.3 hotdoc +pip3 install meson==0.56.0 hotdoc # Install the dependencies of gstreamer dnf builddep -y gstreamer1 \ diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index 6461240..e74f58e 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -18,7 +18,7 @@ variables: # If you are hacking on them or need a them to rebuild, its enough # to change any part of the string of the image you want. ### - FEDORA_TAG: '2020-10-22.0' + FEDORA_TAG: '2020-10-30.0' CERBERO_TAG: '2020-10-22.0' ANDROID_TAG: '2020-10-22.0' MANIFEST_TAG: '2020-10-22.0' @@ -402,7 +402,11 @@ gst indent: - cd gst-build/ # only copy immediate directories. We don't want to modify .wrap files - find /gst-build/subprojects/ -mindepth 1 -maxdepth 1 -type d -exec cp -r \{\} subprojects/ \; + + # Reset the state of the subprojects to what gst-build expects + - meson subprojects update --reset - ./git-update --no-interaction --manifest="${CI_PROJECT_DIR}/manifest.xml" + - meson build/ $MESON_ARGS - ninja -C build/ - ccache --show-stats @@ -760,9 +764,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.0 + - 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"," ") @@ -1101,7 +1113,7 @@ documentation: - pip3 install --upgrade git+https://github.com/hotdoc/hotdoc@28ad9aa59daa49d6b3fd1bc6b144df52af39475b # FIXME: remove this once the docs image is updated - - rm -rf /gst-build/subprojects/pygobject/ + - pip3 install -U meson==0.56.0 - *gst_build - ./gst-uninstalled.py ninja -C build/ plugins_doc_caches |