diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2021-11-01 22:49:11 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2021-11-02 12:42:01 -0600 |
| commit | 91e1369365dfeed19fec8a76605932f0f18d234b (patch) | |
| tree | d7fea69b232c18dd48f5c9e6844d9c271565cefe | |
| parent | 5291230e730f10bf14a6ae5068c5826fef615cd9 (diff) | |
gitlab-ci: Add OpenSSL specific build
| -rw-r--r-- | .gitlab-ci.yml | 42 |
1 files changed, 40 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7a6d55e..28f27b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -139,7 +139,6 @@ build msys2: # # 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-$env:GLIB_VERSION\subprojects\libffi.wrap && @@ -159,7 +158,46 @@ build msvc x86: extends: .build msvc variables: ARCH: 'x86' - + +.build msvc openssl: + extends: .build windows + variables: + GLIB_VERSION: 2.64.2 + 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"," ") + - $env:MESON_ARGS += " -Dcrypto-library=openssl" + + # 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-$env:GLIB_VERSION\subprojects\libffi.wrap && + meson wrap promote subprojects\glib-$env:GLIB_VERSION\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 openssl: + extends: .build msvc openssl + variables: + ARCH: 'amd64' + +build msvc x86 openssl: + extends: .build msvc openssl + variables: + ARCH: 'x86' + test: stage: test interruptible: true |