@@ -724,6 +724,13 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE
724
724
# "suites".
725
725
T_C : " \" C:/Program Files/Git/usr/bin/timeout.exe\" -v -k60s 15m"
726
726
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
+
727
734
sysinfo_script : |
728
735
chcp
729
736
systeminfo
@@ -749,13 +756,6 @@ task:
749
756
depends_on : SanityCheck
750
757
only_if : $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*windows.*'
751
758
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
-
759
759
setup_additional_packages_script : |
760
760
REM choco install -y --no-progress ...
761
761
@@ -801,13 +801,6 @@ task:
801
801
depends_on : SanityCheck
802
802
only_if : $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*windows.*'
803
803
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
-
811
804
# 1.0.1 is borked with msbuild
812
805
meson_downgrade_script : |
813
806
pip install meson!=1.0.1
@@ -848,13 +841,6 @@ task:
848
841
# otherwise it'll be sorted before other tasks
849
842
depends_on : SanityCheck
850
843
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
-
858
844
env :
859
845
TEST_JOBS : 4 # higher concurrency causes occasional failures
860
846
CCACHE_DIR : C:/msys64/ccache
@@ -924,13 +910,6 @@ task:
924
910
# currently have a tool for that...
925
911
CIRRUS_ESCAPING_PROCESSES : 1
926
912
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
-
934
913
configure_script :
935
914
# copy errors out when using forward slashes
936
915
- copy src\tools\ci\windows_build_config.pl src\tools\msvc\config.pl
0 commit comments