summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJordan Petridis <jordan@centricular.com>2022-05-19 16:18:52 +0300
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2022-05-20 14:54:16 +0000
commit78b80836abfa19e00c9a3bbe7e63fe9aa11df558 (patch)
tree0867b9171346ed7a9d12e0d0cdd77831ef737bcc /.gitlab-ci.yml
parent39568918defc769ad25ff5f2341ab6c68a42844f (diff)
downloadgstreamer-78b80836abfa19e00c9a3bbe7e63fe9aa11df558.tar.gz
ci: run ninja install post build
Make sure no weird regressions creep in. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2458>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml22
1 files changed, 21 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e988fa081..b2a0e318e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -296,6 +296,20 @@ gst indent:
variables:
MESON_ARGS: *simple_build
+build fedora x86_64:
+ extends:
+ - '.fedora image'
+ - '.fdo.suffixed-image@fedora'
+ - '.build fedora x86_64'
+ needs:
+ - "fedora amd64 docker"
+ script:
+ - *build
+ - ./gst-env.py gst-inspect-1.0 --version
+ - ./gst-env.py gst-inspect-1.0
+ - meson install --destdir $CI_PROJECT_DIR/destdir -C build
+ - rm -rf $CI_PROJECT_DIR/destdir
+
build nodebug fedora x86_64:
extends:
- '.fedora image'
@@ -355,7 +369,7 @@ build clang fedora x86_64:
- $env:MESON_CROSS_ARGS = $env:MESON_CROSS_ARGS.replace("`n"," ")
- cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
meson build $env:MESON_ARGS $env:MESON_CROSS_ARGS &&
- ninja -C build"
+ meson compile -C build"
artifacts:
expire_in: "7 days"
when: "always"
@@ -366,6 +380,12 @@ build vs2019 amd64:
extends: '.build windows'
variables:
ARCH: 'amd64'
+ script:
+ - !reference [".build windows", "script",]
+ - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
+ mkdir .\destdir &&
+ meson install --destdir=$env:CI_PROJECT_DIR\destdir -C build &&
+ rmdir /s /q $env:CI_PROJECT_DIR\destdir"
build vs2019 x86:
extends: '.build windows'