diff options
| author | Jordan Petridis <jordan@centricular.com> | 2020-12-16 17:22:40 +0200 |
|---|---|---|
| committer | GStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-01-27 13:15:07 +0000 |
| commit | dbf14146b95093f217a7295c8a392396821db901 (patch) | |
| tree | e31b883911432e9f05a21f858373e56ada67c42f | |
| parent | 8aa80fb7140cff633d99490ce51d57f9147c2767 (diff) | |
citemplate: use meson 0.56 and suproject update --reset
The windows build will be updated in a later
commit.
Close #73 #74 #75
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/375>
| -rw-r--r-- | docker/fedora/prepare.sh | 2 | ||||
| -rw-r--r-- | gitlab/ci_template.yml | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/docker/fedora/prepare.sh b/docker/fedora/prepare.sh index 1024be6..60f877d 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.2 hotdoc # Install the dependencies of gstreamer dnf builddep -y gstreamer1 \ diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index ac69fdc..c0133f7 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -21,7 +21,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: '2021-01-22.0' CERBERO_TAG: '2020-10-22.0' ANDROID_TAG: '2020-10-22.0' MANIFEST_TAG: '2020-10-22.0' @@ -427,7 +427,11 @@ check allow-edit: - 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 @@ -1114,7 +1118,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.2 - *gst_build - ./gst-uninstalled.py ninja -C build/ plugins_doc_caches |