From: Andres Freund Date: Tue, 4 Jun 2024 02:06:50 +0000 (-0700) Subject: ci: windows: Use the same image for VS and MinGW tasks X-Git-Tag: REL_15_8~91 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b52e2298d8529eab777eaca339da3b04c862f9c;p=thirdparty%2Fpostgresql.git ci: windows: Use the same image for VS and MinGW tasks The VS and MinGW Windows images have been merged, to reduce the space needed for images. Before 98811323c8e the split helped boot performance, but now that we are using VMs that doesn't appear to be the case anymore. Author: Nazir Bilal Yavuz Discussion: https://postgr.es/m/CAN55FZ2kWYjPd7uUC5QswrB3tfVJDiURqC%2BMGM6a3oeev%3DVgOA%40mail.gmail.com Backpatch: 15-, where CI was added --- diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml index b03d128184d..500996ffd70 100644 --- a/.cirrus.tasks.yml +++ b/.cirrus.tasks.yml @@ -353,6 +353,7 @@ task: MSBFLAGS: -m -verbosity:minimal "-consoleLoggerParameters:Summary;ForceNoAlign" /p:TrackFileAccess=false -nologo DISK_SIZE: 50 + IMAGE_FAMILY: pg-ci-windows-ci # If tests hang forever, cirrus eventually times out. In that case log # output etc is not uploaded, making the problem hard to debug. Of course @@ -376,7 +377,6 @@ task: # given that it explicitly prevents crash dumps from working... # 0x8001 is SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX CIRRUS_WINDOWS_ERROR_MODE: 0x8001 - IMAGE_FAMILY: pg-ci-windows-ci-vs-2019 <<: *windows_task_template