Commit83fc61c

committed

ci: windows: Use the same image for VS and MinGW tasks

The VS and MinGW Windows images have been merged, to reduce the space neededfor images. Before9881132 the split helped boot performance, but now thatwe are using VMs that doesn't appear to be the case anymore.Author: Nazir Bilal Yavuz <byavuz81@gmail.com>Discussion:https://postgr.es/m/CAN55FZ2kWYjPd7uUC5QswrB3tfVJDiURqC%2BMGM6a3oeev%3DVgOA%40mail.gmail.comBackpatch: 15-, where CI was added

1 parentf04d1c1 commit83fc61cCopy full SHA for 83fc61c

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -520,6 +520,7 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE`
`520`	`520`	`PG_TEST_USE_UNIX_SOCKETS:1`
`521`	`521`	`PG_REGRESS_SOCK_DIR:"c:/cirrus/"`
`522`	`522`	`DISK_SIZE:50`
	`523`	`+IMAGE_FAMILY:pg-ci-windows-ci`
`523`	`524`
`524`	`525`	`sysinfo_script:\|`
`525`	`526`	`chcp`
`@@ -543,7 +544,6 @@ task:`
`543`	`544`	`# given that it explicitly prevents crash dumps from working...`
`544`	`545`	`# 0x8001 is SEM_FAILCRITICALERRORS \| SEM_NOOPENFILEERRORBOX`
`545`	`546`	`CIRRUS_WINDOWS_ERROR_MODE:0x8001`
`546`		`-IMAGE_FAMILY:pg-ci-windows-ci-vs-2019`
`547`	`547`
`548`	`548`	`<<:*windows_task_template`
`549`	`549`
`@@ -604,7 +604,6 @@ task:`
`604`	`604`	`# Start bash in current working directory`
`605`	`605`	`CHERE_INVOKING:1`
`606`	`606`	`BASH:C:\msys64\usr\bin\bash.exe -l`
`607`		`-IMAGE_FAMILY:pg-ci-windows-ci-mingw64`
`608`	`607`
`609`	`608`	`<<:*windows_task_template`
`610`	`609`

Comments

(0)