Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 83fc61c

Browse files
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 needed for images. Before 9881132 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 <byavuz81@gmail.com> Discussion: https://postgr.es/m/CAN55FZ2kWYjPd7uUC5QswrB3tfVJDiURqC%2BMGM6a3oeev%3DVgOA%40mail.gmail.com Backpatch: 15-, where CI was added
1 parent f04d1c1 commit 83fc61c

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

.cirrus.tasks.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,7 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE
520520
PG_TEST_USE_UNIX_SOCKETS: 1
521521
PG_REGRESS_SOCK_DIR: "c:/cirrus/"
522522
DISK_SIZE: 50
523+
IMAGE_FAMILY: pg-ci-windows-ci
523524

524525
sysinfo_script: |
525526
chcp
@@ -543,7 +544,6 @@ task:
543544
# given that it explicitly prevents crash dumps from working...
544545
# 0x8001 is SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX
545546
CIRRUS_WINDOWS_ERROR_MODE: 0x8001
546-
IMAGE_FAMILY: pg-ci-windows-ci-vs-2019
547547

548548
<<: *windows_task_template
549549

@@ -604,7 +604,6 @@ task:
604604
# Start bash in current working directory
605605
CHERE_INVOKING: 1
606606
BASH: C:\msys64\usr\bin\bash.exe -l
607-
IMAGE_FAMILY: pg-ci-windows-ci-mingw64
608607

609608
<<: *windows_task_template
610609

0 commit comments

Comments
 (0)