diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-01-27 11:25:53 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-01-28 02:01:39 +0530 |
| commit | 673b7427512d3af498d49ed4792174c74e00f0ab (patch) | |
| tree | 8c896b76ba13401653137ddff656a9dffb50fa96 /.gitlab-ci.yml | |
| parent | 72bd408c392afe143b8d1fb69428eff060d295fb (diff) | |
| download | gstreamer-673b7427512d3af498d49ed4792174c74e00f0ab.tar.gz | |
ci: Add a Windows native cross-arm64 job with a new image
Needed an update to the windows Dockerfile to:
1. Install the 'UniversalBuildTools' workload for Cerbero
2. Install ARM and ARM64 workloads for cross-uwp-universal in Cerbero
3. Install VS 2019 since we need that for ARM64 NEON support in Opus
We can't test UWP in gstreamer.git because glib needs custom patches
for that. It will be tested in Cerbero.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1570>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfb4fc0acf..fc6b716ae2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,7 +27,7 @@ variables: ### FEDORA_TAG: '2021-12-03.1' INDENT_TAG: '2021-10-04.0' - WINDOWS_TAG: "2021-10-12.0" + WINDOWS_TAG: "2022-01-26.3" GST_UPSTREAM_REPO: 'gstreamer/gstreamer' FDO_UPSTREAM_REPO: 'gstreamer/gstreamer' @@ -388,6 +388,9 @@ build clang fedora x86_64: -Dvaapi=disabled -Dgst-plugins-base:pango=enabled -Dgst-plugins-good:cairo=enabled + # Needs to not be empty otherwise the newline -> space replace command in + # `script:` will fail + MESON_CROSS_ARGS: ' ' rules: # If this matches, it means the pipeline is running against either the main # or a stable branch, so make it manual @@ -400,8 +403,9 @@ build clang fedora x86_64: # 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"," ") + - $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 && + meson build $env:MESON_ARGS $env:MESON_CROSS_ARGS && ninja -C build" # XXX: Re-enable when uploading stops timing out #artifacts: @@ -409,17 +413,31 @@ build clang fedora x86_64: # when: "always" # paths: # - 'build/meson-logs/' + # - 'vslogs.zip' -build vs2017 amd64: +build vs2019 amd64: extends: '.build windows' variables: ARCH: 'amd64' -build vs2017 x86: +build vs2019 x86: extends: '.build windows' variables: ARCH: 'x86' +build vs2019 arm64 uwp: + extends: '.build windows' + variables: + ARCH: 'arm64' + # pango pulls in cairo which pulls in pixman which doesn't build because of + # https://github.com/mesonbuild/meson/issues/9889 + MESON_CROSS_ARGS: > + -Dgst-plugins-base:pango=disabled + -Dgst-plugins-good:cairo=disabled + -Dgst-devtools:cairo=disabled + --cross-file ci/meson/vs2019-arm64-cross-file.txt + --native-file ci/meson/vs2019-x64-native-file.txt + build msys2 : extends: '.build windows' timeout: '60min' |