Skip to content

Commit 3083cbf

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 afcc876 commit 3083cbf

File tree

1 file changed

+7
-28
lines changed

1 file changed

+7
-28
lines changed

.cirrus.yml

+7-28
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
@@ -801,13 +801,6 @@ task:
801801
depends_on: SanityCheck
802802
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*windows.*'
803803

804-
compute_engine_instance:
805-
image_project: $IMAGE_PROJECT
806-
image: family/pg-ci-windows-ci-vs-2019
807-
platform: windows
808-
cpu: $CPUS
809-
memory: 4G
810-
811804
# 1.0.1 is borked with msbuild
812805
meson_downgrade_script: |
813806
pip install meson!=1.0.1
@@ -848,13 +841,6 @@ task:
848841
# otherwise it'll be sorted before other tasks
849842
depends_on: SanityCheck
850843

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-
858844
env:
859845
TEST_JOBS: 4 # higher concurrency causes occasional failures
860846
CCACHE_DIR: C:/msys64/ccache
@@ -924,13 +910,6 @@ task:
924910
# currently have a tool for that...
925911
CIRRUS_ESCAPING_PROCESSES: 1
926912

927-
compute_engine_instance:
928-
image_project: $IMAGE_PROJECT
929-
image: family/pg-ci-windows-ci-vs-2019
930-
platform: windows
931-
cpu: $CPUS
932-
memory: 4G
933-
934913
configure_script:
935914
# copy errors out when using forward slashes
936915
- copy src\tools\ci\windows_build_config.pl src\tools\msvc\config.pl

0 commit comments

Comments
 (0)