Skip to content

Commit

Permalink
ci: windows: Use the same image for VS and MinGW tasks
Browse files Browse the repository at this point in the history
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
  • Loading branch information
anarazel committed Jun 4, 2024
1 parent f04d1c1 commit 83fc61c
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions .cirrus.tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE
PG_TEST_USE_UNIX_SOCKETS: 1
PG_REGRESS_SOCK_DIR: "c:/cirrus/"
DISK_SIZE: 50
IMAGE_FAMILY: pg-ci-windows-ci

sysinfo_script: |
chcp
Expand All @@ -543,7 +544,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

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

<<: *windows_task_template

Expand Down

0 comments on commit 83fc61c

Please sign in to comment.