summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChun-wei Fan <fanchunwei@src.gnome.org>2023-05-11 18:57:21 +0800
committerChun-wei Fan <fanchunwei@src.gnome.org>2023-05-12 10:53:48 +0800
commit71f3a2c1aa2c2f4f79ebff0b412ac7a52a8c069c (patch)
tree9d843d882ced144a49589d38b26198191d10ffb6
parentdb7931c4640f3f6eb0b2d1c8481be6cebd36eee0 (diff)
downloadlibrsvg-improve-dep-discovery-msvc.tar.gz
CI: Actually test the buildimprove-dep-discovery-msvc
We now expect librsvg to successfully build on the CI, as well as the C API tests. Not yet for Pango though, sadly, as upstream Cairo needs to be fixed, and we run the Rust tests but do not expect it to pass, similar to what happens to the MinGW/msys64 builds.
-rw-r--r--ci/test-msvc.bat7
1 files changed, 3 insertions, 4 deletions
diff --git a/ci/test-msvc.bat b/ci/test-msvc.bat
index 99ae1814..d1a20e5f 100644
--- a/ci/test-msvc.bat
+++ b/ci/test-msvc.bat
@@ -91,10 +91,9 @@ rustup-init -y --default-toolchain=stable-%RUST_HOST% --default-host=%RUST_HOST%
:: now build librsvg
cd win32
nmake /f generate-msvc.mak generate-nmake-files PYTHON=python || goto :error
-:: ideally, we should use `nmake /f Makefile.vc ... || goto :error`, but let's allow this command to fail
-:: for now, since for this pipeline to really pass we need some MRs that fixes NMake builds and
-:: optional dependencies to land.
-nmake /f Makefile.vc CFG=release PREFIX=%INST% PKG_CONFIG=%INST%\bin\pkg-config.exe PKG_CONFIG_PATH=%INST%\lib\pkgconfig
+nmake /f Makefile.vc CFG=release PREFIX=%INST% PKG_CONFIG=%INST%\bin\pkg-config.exe PKG_CONFIG_PATH=%INST%\lib\pkgconfig || goto :error
+nmake /f Makefile.vc CFG=release PREFIX=%INST% PKG_CONFIG=%INST%\bin\pkg-config.exe PKG_CONFIG_PATH=%INST%\lib\pkgconfig tests || goto :error
+nmake /f Makefile.vc CFG=release PREFIX=%INST% PKG_CONFIG=%INST%\bin\pkg-config.exe PKG_CONFIG_PATH=%INST%\lib\pkgconfig rsvg_rust_tests
goto :EOF
:error