Commit 3100c8120e0ff423db8d8134a8073e639371993e
2022-02-15T10:27:47
.gitlab-ci.yml: Add a Universal Windows build target It's compiled for Windows 10 and up, ensuring UNICODE is set (default for UWP) and selecting the proper WINAPI_FAMILY (WINAPI_FAMILY_APP). Do not try to run the UWP exe in the Docker as it doesn't work.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f3af842..e8f8443 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,17 @@ variables:
# Make sure meson is up to date so we don't need to rebuild the image
# with each release.
- pip3 install meson==0.59.1
+ - pip3 install --upgrade certifi
- pip3 install -U ninja
+
+ # Generate a UWP cross-file in case it's used
+ - $PSDefaultParameterValues['Out-File:Encoding'] = 'ASCII'
+ - echo "[binaries]" > uwp-crossfile.meson
+ - echo "c = 'cl'" >> uwp-crossfile.meson
+ - echo "strip = ['true']" >> uwp-crossfile.meson
+ - echo "[built-in options]" >> uwp-crossfile.meson
+ - echo "c_args = ['-DWINAPI_FAMILY=WINAPI_FAMILY_APP', '-DUNICODE', '-D_WIN32_WINNT=0x0A00', '-we4013']" >> uwp-crossfile.meson
+ - echo "c_winlibs = ['windowsapp.lib']" >> uwp-crossfile.meson
script:
# For some reason, options are separated by newlines instead of spaces,
# so we have to replace them first.
@@ -59,11 +69,10 @@ variables:
# script. Environment variables substitutions is done by PowerShell
# before calling `cmd.exe`, that's why we use `$env:FOO` instead of
# `%FOO%`.
- - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
- meson setup build $env:MESON_ARGS_WINDOWS &&
- meson compile --verbose -C build &&
- meson test -C build &&
- meson test -C build --benchmark"
+ - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH $env:VS_UWP &&
+ meson setup build $env:MESON_ARGS_WINDOWS $env:MESON_ARGS_UWP &&
+ meson compile --verbose -C build
+ $env:MESON_WINDOWS_TESTS"
# Format of job names:
@@ -76,12 +85,20 @@ windows meson vs2017 amd64:
extends: '.build windows meson'
variables:
ARCH: 'amd64'
+ MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'
windows meson vs2017 x86:
extends: '.build windows meson'
variables:
ARCH: 'x86'
+ MESON_WINDOWS_TESTS: '&& meson test -C build && meson test -C build --benchmark'
+windows meson vs2017 amd64 uwp:
+ extends: '.build windows meson'
+ variables:
+ ARCH: 'amd64'
+ VS_UWP: '-app_platform=UWP'
+ MESON_ARGS_UWP: '--cross-file uwp-crossfile.meson -Dc_winlibs="windowsapp.lib"'
# Linux Jobs.
#