Skip to content

Commit 45bdd7c

Browse files
author
Marge Bot
committed
Merge branch 'fix-msvc-ci' into 'main'
Fix Visual Studio CI See merge request GNOME/librsvg!855
2 parents 07652d9 + e3897f7 commit 45bdd7c

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,6 @@ vs2017-x64:
403403
when: always
404404
paths:
405405
- "${CI_PROJECT_DIR}/_build/meson-logs"
406-
allow_failure: true
407406

408407
distcheck:
409408
stage: acceptance test

ci/test-msvc.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ if not exist %HOMEPATH%\.cargo\bin\rustup.exe rustup-init -y --default-toolchain
9595

9696
:: now build librsvg
9797
cd win32
98+
99+
:: Fix linking to PCRE for CI's sake
100+
if exist %INST%\lib\libpcre2-8.a copy /b %INST%\lib\libpcre2-8.a %INST%\lib\pcre2-8.lib
98101
nmake /f generate-msvc.mak generate-nmake-files PYTHON=python || goto :error
99102

100103
if "%DOWNGRADE_RUST_VERSION%" == "1" goto :downgrade_rust

0 commit comments

Comments
 (0)