distro-configs/Jenkins/Win32_dev_master.conf | 3 +-- distro-configs/Jenkins/Win32_rel_master.conf | 3 +-- distro-configs/Jenkins/Win64_dev_master.conf | 4 ++-- distro-configs/Jenkins/Win64_rel_master.conf | 4 ++-- distro-configs/Jenkins/screenshot_win.conf | 4 ++-- distro-configs/Jenkins/windows_msc_dbgutil_64 | 11 +---------- distro-configs/Jenkins/windows_wsl_common.conf | 10 ++++++++++ 7 files changed, 19 insertions(+), 20 deletions(-)
New commits: commit f499050960d9e39c478845ade48ee24448babedf Author: Christian Lohmaier <[email protected]> AuthorDate: Mon Oct 13 20:00:12 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Mon Oct 13 21:44:17 2025 +0200 switch Jenkins tinderbox configs to wsl-as-helper style the recend pdfium update bumped the Visual Studio requirement to 2022 and the old hosts are stuck with VS 2019 Change-Id: Icf1bfef855cd87084c4c5a4f880df87ad07055b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192325 Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Christian Lohmaier <[email protected]> diff --git a/distro-configs/Jenkins/Win32_dev_master.conf b/distro-configs/Jenkins/Win32_dev_master.conf index 7ccda1beb829..a733512282b7 100644 --- a/distro-configs/Jenkins/Win32_dev_master.conf +++ b/distro-configs/Jenkins/Win32_dev_master.conf @@ -1,4 +1,3 @@ +INCLUDE:Jenkins/windows_wsl_common --host=i686-pc-cygwin --enable-dbgutil ---enable-odk ---disable-online-update diff --git a/distro-configs/Jenkins/Win32_rel_master.conf b/distro-configs/Jenkins/Win32_rel_master.conf index 3eb0e9da5694..1bf3e2e21d4e 100644 --- a/distro-configs/Jenkins/Win32_rel_master.conf +++ b/distro-configs/Jenkins/Win32_rel_master.conf @@ -1,3 +1,2 @@ +INCLUDE:Jenkins/windows_wsl_common --host=i686-pc-cygwin ---enable-odk ---disable-online-update diff --git a/distro-configs/Jenkins/Win64_dev_master.conf b/distro-configs/Jenkins/Win64_dev_master.conf index 3960c4e5bf23..ad2c917d1cb2 100644 --- a/distro-configs/Jenkins/Win64_dev_master.conf +++ b/distro-configs/Jenkins/Win64_dev_master.conf @@ -1,3 +1,3 @@ +INCLUDE:Jenkins/windows_wsl_common +--host=x86_64-pc-cygwin --enable-dbgutil ---enable-odk ---disable-online-update diff --git a/distro-configs/Jenkins/Win64_rel_master.conf b/distro-configs/Jenkins/Win64_rel_master.conf index d4ec76d28cb2..43717c7b67d8 100644 --- a/distro-configs/Jenkins/Win64_rel_master.conf +++ b/distro-configs/Jenkins/Win64_rel_master.conf @@ -1,2 +1,2 @@ ---enable-odk ---disable-online-update +INCLUDE:Jenkins/windows_wsl_common +--host=x86_64-pc-cygwin diff --git a/distro-configs/Jenkins/screenshot_win.conf b/distro-configs/Jenkins/screenshot_win.conf index 1c780f6991d9..416f31e8963f 100644 --- a/distro-configs/Jenkins/screenshot_win.conf +++ b/distro-configs/Jenkins/screenshot_win.conf @@ -1,3 +1,3 @@ ---host=i686-pc-cygwin +INCLUDE:Jenkins/windows_wsl_common +--host=x86_64-pc-cygwin --with-lang=ALL ---enable-odk diff --git a/distro-configs/Jenkins/windows_msc_dbgutil_64 b/distro-configs/Jenkins/windows_msc_dbgutil_64 index 7ced61e99876..464cab64092e 100644 --- a/distro-configs/Jenkins/windows_msc_dbgutil_64 +++ b/distro-configs/Jenkins/windows_msc_dbgutil_64 @@ -1,13 +1,4 @@ +INCLUDE:Jenkins/windows_wsl_common --host=x86_64-pc-cygwin --enable-dbgutil --disable-dependency-tracking ---enable-odk ---disable-online-update ---with-visual-studio=2022 ---enable-python=fully-internal ---without-lxml ---with-external-tar=E:/lo/lo-externaltar ---with-strawberry-perl-portable=E:/lo/spp ---with-ant-home=E:/lo/apache-ant-1.10.15 ---with-junit=E:/lo/junit-4.10.jar ---with-doxygen=E:/lo/spp/c/bin/doxygen.exe diff --git a/distro-configs/Jenkins/windows_wsl_common.conf b/distro-configs/Jenkins/windows_wsl_common.conf new file mode 100644 index 000000000000..d56701ce1554 --- /dev/null +++ b/distro-configs/Jenkins/windows_wsl_common.conf @@ -0,0 +1,10 @@ +--enable-odk +--disable-online-update +--with-visual-studio=2022 +--enable-python=fully-internal +--without-lxml +--with-external-tar=E:/lo/lo-externaltar +--with-strawberry-perl-portable=E:/lo/spp +--with-ant-home=E:/lo/apache-ant-1.10.15 +--with-junit=E:/lo/junit-4.10.jar +--with-doxygen=E:/lo/spp/c/bin/doxygen.exe
