Skip to content

Commit

Permalink
ci: Use same image for windows tasks
Browse files Browse the repository at this point in the history
After windows VS and mingw image generation tasks are merged on CI repo,
refactor windows postgres tasks to use same image.
  • Loading branch information
nbyavuz committed Aug 7, 2023
1 parent afcc876 commit 3083cbf
Showing 1 changed file with 7 additions and 28 deletions.
35 changes: 7 additions & 28 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,13 @@ WINDOWS_ENVIRONMENT_BASE: &WINDOWS_ENVIRONMENT_BASE
# "suites".
T_C: "\"C:/Program Files/Git/usr/bin/timeout.exe\" -v -k60s 15m"

compute_engine_instance:
image_project: $IMAGE_PROJECT
image: family/pg-ci-windows
platform: windows
cpu: $CPUS
memory: 4G

sysinfo_script: |
chcp
systeminfo
Expand All @@ -749,13 +756,6 @@ task:
depends_on: SanityCheck
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*windows.*'

compute_engine_instance:
image_project: $IMAGE_PROJECT
image: family/pg-ci-windows-ci-vs-2019
platform: windows
cpu: $CPUS
memory: 4G

setup_additional_packages_script: |
REM choco install -y --no-progress ...
Expand Down Expand Up @@ -801,13 +801,6 @@ task:
depends_on: SanityCheck
only_if: $CIRRUS_CHANGE_MESSAGE !=~ '.*\nci-os-only:.*' || $CIRRUS_CHANGE_MESSAGE =~ '.*\nci-os-only:[^\n]*windows.*'

compute_engine_instance:
image_project: $IMAGE_PROJECT
image: family/pg-ci-windows-ci-vs-2019
platform: windows
cpu: $CPUS
memory: 4G

# 1.0.1 is borked with msbuild
meson_downgrade_script: |
pip install meson!=1.0.1
Expand Down Expand Up @@ -848,13 +841,6 @@ task:
# otherwise it'll be sorted before other tasks
depends_on: SanityCheck

compute_engine_instance:
image_project: $IMAGE_PROJECT
image: family/pg-ci-windows-ci-mingw64
platform: windows
cpu: $CPUS
memory: 4G

env:
TEST_JOBS: 4 # higher concurrency causes occasional failures
CCACHE_DIR: C:/msys64/ccache
Expand Down Expand Up @@ -924,13 +910,6 @@ task:
# currently have a tool for that...
CIRRUS_ESCAPING_PROCESSES: 1

compute_engine_instance:
image_project: $IMAGE_PROJECT
image: family/pg-ci-windows-ci-vs-2019
platform: windows
cpu: $CPUS
memory: 4G

configure_script:
# copy errors out when using forward slashes
- copy src\tools\ci\windows_build_config.pl src\tools\msvc\config.pl
Expand Down

0 comments on commit 3083cbf

Please sign in to comment.