=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Feb 1 03:34:33 UTC 2025 On branch cf/3709 nothing to commit, working tree clean === applying patch ./0001-cirrus-windows-add-compiler_warnings_script.patch Applied patch to '.cirrus.tasks.yml' cleanly. [cf/3709 dc231f947d] cirrus/windows: add compiler_warnings_script Author: Justin Pryzby Date: Wed May 25 21:53:22 2022 -0500 1 file changed, 10 insertions(+), 1 deletion(-) === applying patch ./0002-cirrus-windows-ccache.patch Applied patch to '.cirrus.tasks.yml' with conflicts. U .cirrus.tasks.yml diff --cc .cirrus.tasks.yml index 7134cd4d06,fb4ea3d666..0000000000 --- a/.cirrus.tasks.yml +++ b/.cirrus.tasks.yml @@@ -570,9 -579,10 +579,14 @@@ task type c:\Windows\System32\Drivers\etc\hosts # Use /DEBUG:FASTLINK to avoid high memory usage during linking + # Use /Z7 to write separate debug files, to allow ccache to work configure_script: | vcvarsall x64 ++<<<<<<< ours + meson setup --backend ninja --buildtype debug -Dc_link_args=/DEBUG:FASTLINK -Dcassert=true -Dinjection_points=true -Db_pch=true -Dextra_lib_dirs=c:\openssl\1.1\lib -Dextra_include_dirs=c:\openssl\1.1\include -DTAR=%TAR% build ++======= + meson setup build --backend ninja --buildtype debug -Dc_link_args=/DEBUG:FASTLINK -Dcassert=true -Dinjection_points=true -Db_pch=true -Dextra_lib_dirs=c:\openssl\1.1\lib -Dextra_include_dirs=c:\openssl\1.1\include -DTAR=%TAR% -DPG_TEST_EXTRA="%PG_TEST_EXTRA%" -Dc_args="/Z7" ++>>>>>>> theirs build_script: | vcvarsall x64