summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2019-08-01 20:10:45 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2019-08-05 15:13:54 -0400
commit96fc8686d66f8021cea1299bc8d018db7d08ebaa (patch)
treee0b8863a93309aef3fbc60c9efb1d8887c9fbf37
parenta8511b2def7fc33b11d8e25aa38ce921b3e092e9 (diff)
downloadlibnice-msvc-build.tar.gz
gitlab-ci: Add MSVC buildsmsvc-build
Uses a wrap file to download a prebuilt OpenSSL from our git as a subproject. Builds for both amd64 & x86
-rw-r--r--.gitlab-ci.yml37
1 files changed, 37 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e57ac80..120dd4c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,6 +112,43 @@ build msys2:
ninja -C build &&
meson test -C build --print-errorlogs --suite libnice"
+.build msvc:
+ extends: build msys2
+ script:
+ # 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"," ")
+
+ # Build and run the tests.
+ # This is part of the same job due to a bug in the gitlab-runner
+ # that prevents us from exporting artifacts with docker-windows
+ # executors. It has since been fixed in gitlab 12.1, but
+ # we are blocked from upgrading currently.
+ #
+ # Gitlab Runner issue: https://gitlab.com/gitlab-org/gitlab-runner/issues/4291
+ # Blocked upgrade issue: https://gitlab.freedesktop.org/gstreamer/gst-ci/issues/6#note_192780
+ - New-Item -Path subprojects -Name openssl.wrap -Value "[wrap-git]`r`ndirectory=openssl`r`nurl=https://gitlab.freedesktop.org/libnice/openssl-binaries-for-ci.git`r`nrevision=1.1.1c`r`n"
+ - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
+ meson subprojects download &&
+ meson wrap promote subprojects\glib\subprojects\libffi.wrap &&
+ meson wrap promote subprojects\glib\subprojects\zlib.wrap &&
+ meson wrap promote subprojects\glib\subprojects\proxy-libintl.wrap &&
+ meson subprojects download"
+ - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
+ meson build $env:MESON_ARGS &&
+ ninja -C build &&
+ meson test -C build --print-errorlogs --suite libnice"
+
+build msvc amd64:
+ extends: .build msvc
+ variables:
+ ARCH: 'amd64'
+
+build msvc x86:
+ extends: .build msvc
+ variables:
+ ARCH: 'x86'
+
test meson:
stage: test
image: registry.freedesktop.org/libnice/libnice/centos7/meson-build