From b76dd329bcf6af63de96ed26d8bb1945149467c7 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Sun, 13 Nov 2022 14:03:27 -0600 Subject: [PATCH 07/11] cirrus: clean up windows task - remove CIRRUS_ESCAPING_PROCESSES, which wasn't needed since the task was converted to meson in e6b6ea025; - name the task the same as the other tasks using meson; - use the otherwise-unused TAR variable; --- .cirrus.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 6fb8ed0cded..3045278f4b1 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -410,7 +410,7 @@ task: task: - name: Windows - Server 2019, VS 2019 - Meson & ninja + name: Windows - Server 2019, VS 2019 - Meson env: # Half the allowed per-user CPU cores @@ -428,13 +428,6 @@ task: PG_TEST_USE_UNIX_SOCKETS: 1 PG_REGRESS_SOCK_DIR: "c:/cirrus/" - # startcreate_script starts a postgres instance that we don't want to get - # killed at the end of that script (it's stopped in stop_script). Can't - # trivially use background_scripts because a) need pg_ctl's dropping of - # permissions b) need to wait for startup to have finished, and we don't - # currently have a tool for that... - CIRRUS_ESCAPING_PROCESSES: 1 - # Cirrus defaults to SetErrorMode(SEM_NOGPFAULTERRORBOX | ...). That # prevents crash reporting from working unless binaries do SetErrorMode() # themselves. Furthermore, it appears that either python or, more likely, @@ -463,7 +456,7 @@ task: # Use /DEBUG:FASTLINK to avoid high memory usage during linking configure_script: | vcvarsall x64 - meson setup --backend ninja --buildtype debug -Dc_link_args=/DEBUG:FASTLINK -Dcassert=true -Db_pch=true -Dssl=openssl -Dextra_lib_dirs=c:\openssl\1.1\lib -Dextra_include_dirs=c:\openssl\1.1\include -DTAR=c:/windows/system32/tar.exe -DPG_TEST_EXTRA="%PG_TEST_EXTRA%" build + meson setup --backend ninja --buildtype debug -Dc_link_args=/DEBUG:FASTLINK -Dcassert=true -Db_pch=true -Dssl=openssl -Dextra_lib_dirs=c:\openssl\1.1\lib -Dextra_include_dirs=c:\openssl\1.1\include -DTAR=%TAR% -DPG_TEST_EXTRA="%PG_TEST_EXTRA%" build build_script: | vcvarsall x64 -- 2.25.1