diff options
| author | Andres Freund <andres@anarazel.de> | 2024-06-03 19:06:50 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2024-06-03 19:06:50 -0700 |
| commit | 83fc61ccfaf38aebe73eacdfc712106797d75b39 (patch) | |
| tree | ce533ada7ea35ff25012d2527a9c0bf900776365 | |
| parent | f04d1c1db01199f02b0914a7ca2962c531935717 (diff) | |
| download | postgresql-83fc61ccfaf38aebe73eacdfc712106797d75b39.tar.gz postgresql-83fc61ccfaf38aebe73eacdfc712106797d75b39.zip | |
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 <byavuz81@gmail.com>
Discussion: https://postgr.es/m/CAN55FZ2kWYjPd7uUC5QswrB3tfVJDiURqC%2BMGM6a3oeev%3DVgOA%40mail.gmail.com
Backpatch: 15-, where CI was added
| -rw-r--r-- | .cirrus.tasks.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml index a2388cd5036..33646faeadf 100644 --- a/.cirrus.tasks.yml +++ b/.cirrus.tasks.yml @@ -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 @@ -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 @@ -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 |