Commit3a2cc5a

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 parent65b8c40 commit3a2cc5aCopy full SHA for 3a2cc5a

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -516,6 +516,7 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE`
`516`	`516`	`PG_TEST_USE_UNIX_SOCKETS:1`
`517`	`517`	`PG_REGRESS_SOCK_DIR:"c:/cirrus/"`
`518`	`518`	`DISK_SIZE:50`
	`519`	`+IMAGE_FAMILY:pg-ci-windows-ci`
`519`	`520`
`520`	`521`	`sysinfo_script:\|`
`521`	`522`	`chcp`
`@@ -539,7 +540,6 @@ task:`
`539`	`540`	`# given that it explicitly prevents crash dumps from working...`
`540`	`541`	`# 0x8001 is SEM_FAILCRITICALERRORS \| SEM_NOOPENFILEERRORBOX`
`541`	`542`	`CIRRUS_WINDOWS_ERROR_MODE:0x8001`
`542`		`-IMAGE_FAMILY:pg-ci-windows-ci-vs-2019`
`543`	`543`
`544`	`544`	`<<:*windows_task_template`
`545`	`545`
`@@ -600,7 +600,6 @@ task:`
`600`	`600`	`# Start bash in current working directory`
`601`	`601`	`CHERE_INVOKING:1`
`602`	`602`	`BASH:C:\msys64\usr\bin\bash.exe -l`
`603`		`-IMAGE_FAMILY:pg-ci-windows-ci-mingw64`
`604`	`603`
`605`	`604`	`<<:*windows_task_template`
`606`	`605`

Comments

(0)