Skip to content

Commit ade2f66

Browse files
committed
ci: Use same image for windows tasks
After windows VS and mingw image generation tasks are merged on CI repo, refactor windows postgres tasks to use same image.
1 parent 2f98dea commit ade2f66

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

.cirrus.yml

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,13 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE
724724
# "suites".
725725
T_C: "\"C:/Program Files/Git/usr/bin/timeout.exe\" -v -k60s 15m"
726726

727+
compute_engine_instance:
728+
image_project: $IMAGE_PROJECT
729+
image: family/pg-ci-windows
730+
platform: windows
731+
cpu: $CPUS
732+
memory: 4G
733+
727734
sysinfo_script: |
728735
chcp
729736
systeminfo
@@ -749,13 +756,6 @@ task:
749756
depends_on: SanityCheck
750757
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*windows.*'
751758

752-
compute_engine_instance:
753-
image_project: $IMAGE_PROJECT
754-
image: family/pg-ci-windows-ci-vs-2019
755-
platform: windows
756-
cpu: $CPUS
757-
memory: 4G
758-
759759
setup_additional_packages_script: |
760760
REM choco install -y --no-progress ...
761761
@@ -848,13 +848,6 @@ task:
848848
# otherwise it'll be sorted before other tasks
849849
depends_on: SanityCheck
850850

851-
compute_engine_instance:
852-
image_project: $IMAGE_PROJECT
853-
image: family/pg-ci-windows-ci-mingw64
854-
platform: windows
855-
cpu: $CPUS
856-
memory: 4G
857-
858851
env:
859852
TEST_JOBS: 4 # higher concurrency causes occasional failures
860853
CCACHE_DIR: C:/msys64/ccache

0 commit comments

Comments
 (0)