ci: Update Windows task image up to `visualstudio2022` #25460

hebasto commented at 6:55 PM on June 23, 2022: member

Besides upgrading Visual Studio, which seems inevitable, this PR also:

bumps vcpkg to the latest version (previous one was in bitcoin/bitcoin#24847)
fixes cache size limit for ccache

hebasto force-pushed on Jun 23, 2022

in .cirrus.yml:102 in 5b664df2d9 outdated

  98 | @@ -99,10 +99,10 @@ task:
  99 |    windows_container:
 100 |      cpu: 4
 101 |      memory: 8G
 102 | -    image: cirrusci/windowsservercore:visualstudio2019
 103 | +    image: cirrusci/windowsservercore:visualstudio2022

MarcoFalke commented at 7:11 PM on June 23, 2022:

I can't find this in the docs: https://cirrus-ci.org/guide/windows/#os-versions

hebasto commented at 9:18 PM on June 23, 2022:

Yes. I hastened a bit :)

https://github.com/cirruslabs/docker-images-windows/pull/30

But a new image is not available yet on https://hub.docker.com/r/cirrusci/windowsservercore/tags.

DrahtBot added the label Tests on Jun 23, 2022

hebasto closed this on Jun 23, 2022

MarcoFalke commented at 5:36 AM on June 24, 2022: member

Looks like it is now?

MarcoFalke commented at 5:37 AM on June 24, 2022: member

Please revert fa72e0ba15c6382e9068be221ab4872bef000cbc as well

hebasto commented at 7:51 AM on June 24, 2022: member

Looks like it is now?

Still getting "Agent is not responding!" error (

MarcoFalke added this to the milestone 24.0 on Jun 24, 2022

hebasto reopened this on Jun 24, 2022

hebasto commented at 9:22 PM on June 24, 2022: member

@sipsorcery

~Could you look at linker error here? (fwiw, I have wiped all caches)~

nm, forgot to update PlatformToolset :)

in .cirrus.yml:99 in 5b664df2d9 outdated

  98 | @@ -99,10 +99,10 @@ task:
  99 |    windows_container:

MarcoFalke commented at 7:44 AM on June 25, 2022:

could adjust the name to mention 22?

hebasto commented at 9:40 AM on June 25, 2022:

Done.

ci: Update Windows task image up to visualstudio2022 156bc89788

hebasto force-pushed on Jun 25, 2022

ci: Limit ccache cache size properly on "Win64 native" task b9a5a9b68c

ci: Bump vcpkg to the latest version

Dependency changes:
 - boost-* 1.78.0#0 -> 1.79.0#0

a18c4c1871

hebasto force-pushed on Jun 25, 2022

hebasto commented at 12:02 PM on June 25, 2022: member

@MarcoFalke

Please revert fa72e0b as well

See #25472.

hebasto renamed this:
~~ci: Update Windows task image up to visualstudio2022~~
ci: Update Windows task image up to `visualstudio2022`
on Jun 25, 2022

hebasto marked this as ready for review on Jun 25, 2022

in .cirrus.yml:100 in 3dabd28918 outdated

  93 | @@ -94,17 +94,17 @@ task:
  94 |      FILE_ENV: "./ci/test/00_setup_env_native_tidy.sh"
  95 |  
  96 |  task:
  97 | -  name: "Win64 native [msvc]"
  98 | +  name: "Win64 native [vs2022]"
  99 |    << : *FILTER_TEMPLATE
 100 |    windows_container:
 101 | -    cpu: 4
 102 | +    cpu: 6

MarcoFalke commented at 2:51 PM on June 25, 2022:

any reason to change this? With 6 cpu it finished 1 minute earlier compared to master ( https://cirrus-ci.com/task/5018066990923776 ), so it seems like a random fluke.

Also, if someone pushes several pull requests at the same time, the scheduler will hit the total cpu limit earlier.

MarcoFalke commented at 2:52 PM on June 25, 2022:

Also, looking at the graph, the CPU usage density is less, indicating that the 5th and 6th cpu may be idle most of the time

hebasto commented at 3:04 PM on June 25, 2022:

any reason to change this?

On master, the time required to get the task done with no caches is very close to 2 hours limit.

With 6 cpu it finished 1 minute earlier compared to master ( https://cirrus-ci.com/task/5018066990923776 ), so it seems like a random fluke.

Such comparison is not correct, because vcpkg_binary cache was invalidated for this PR. Functional tests are more then 10 minutes faster now.

Also, looking at the graph, the CPU usage density is less, indicating that the 5th and 6th cpu may be idle most of the time

~Will 5 cpus be OK?~ UPDATE: Odd CPU number does not work (

MarcoFalke commented at 7:52 AM on June 26, 2022:

On master, the time required to get the task done with no caches is very close to 2 hours limit.

Ok, no objection then.

Is there a reason why vs22 needs more resources?

hebasto commented at 10:32 AM on June 26, 2022:

Is there a reason why vs22 needs more resources?

On master, with cleared caches:

time: 01:56:44
peak memory usage: 5.08 GB

On master + 156bc89788034c509051e0635ed40694b8d717c6 commit, with cleared caches:

time: 01:58:25
peak memory usage: 5.12 GB

hebasto commented at 4:42 PM on June 26, 2022:

Actually, there is no significant difference in resources at all.

MarcoFalke commented at 11:16 AM on June 27, 2022:

I think it might be best to revert this. Looks like now this won't be scheduled until 4 hours later. If the CPU was reduced, so that it was scheduled earlier, it would take 15 minutes longer to run, but still finish earlier.

hebasto commented at 11:59 AM on June 27, 2022:

I think it might be best to revert this. Looks like now this won't be scheduled until 4 hours later. If the CPU was reduced, so that it was scheduled earlier, it would take 15 minutes longer to run, but still finish earlier.

Ok, But a similar situation with ARM task been observed right now.

hebasto commented at 12:04 PM on June 27, 2022:

I think it might be best to revert this.

#25483

MarcoFalke commented at 7:54 AM on June 26, 2022: member

too bad that this doesn't fix #25472. Though, I guess it can't hurt to bump now, given that we'll have to do it anyway at some point. However, I think our windows docs should match the windows CI.

sipsorcery commented at 8:37 AM on June 26, 2022: member

@sipsorcery

~Could you look at linker error here? (fwiw, I have wiped all caches)~

nm, forgot to update PlatformToolset :)

I find myself doing that everytime I do a build. Maybe this PR is a good time to udate the default?

sipsorcery commented at 8:38 AM on June 26, 2022: member

ACK 3dabd2891825a0b9a40276dffc5953f91a013c8d.

ci: Increase CPU number for "Win64 native" task

Currently, the time it takes to get the "Win64 native" task done with
all of the caches been invalidated is very close to the 2 hours limit.

This task is the only one which runs on Windows Community Cluster,
therefore this change should not affect other CI tasks.

849cf967a3

doc: Make Windows build docs match the CI task

Added Visual Studio 2022.

460c6c7248

build: Bump default `PlatformToolset` for Visual Studio 2022 05b2d9fe07

hebasto force-pushed on Jun 26, 2022

in .cirrus.yml:182 in 05b2d9fe07

 178 | @@ -179,7 +179,7 @@ task:
 179 |    build_script:
 180 |      - '%x64_NATIVE_TOOLS%'
 181 |      - cd %CIRRUS_WORKING_DIR%
 182 | -    - ccache --zero-stats
 183 | +    - ccache --zero-stats --max-size=%CCACHE_SIZE%

MarcoFalke commented at 9:35 AM on June 26, 2022:

is CCACHE_SIZE set at all?

hebasto commented at 9:37 AM on June 26, 2022:

https://github.com/bitcoin/bitcoin/blob/0dd34773334c7f4db7b05df30ee61b011795b46d/.cirrus.yml#L6

hebasto commented at 9:40 AM on June 26, 2022:

On master:

Summary:
  Hits:             239 /  239 (100.0 %)
    Direct:         239 /  239 (100.0 %)
    Preprocessed:     0 /    0
  Misses:             0
    Direct:           0
    Preprocessed:     0
  Uncacheable:       10
Primary storage:
  Hits:             478 /  478 (100.0 %)
  Misses:             0
  Cache size (GB): 1.35 / 5.00 (27.06 %)

Use the -v/--verbose option for more details.

With this PR:

Summary:
  Hits:             239 /  239 (100.0 %)
    Direct:         239 /  239 (100.0 %)
    Preprocessed:     0 /    0
  Misses:             0
    Direct:           0
    Preprocessed:     0
  Uncacheable:       10
Primary storage:
  Hits:             478 /  478 (100.0 %)
  Misses:             0
  Cache size (GB): 0.07 / 0.20 (32.93 %)

Use the -v/--verbose option for more details.

Compare the "Cache size" string.

hebasto commented at 9:36 AM on June 26, 2022: member

Updated 3dabd2891825a0b9a40276dffc5953f91a013c8d -> 05b2d9fe076233961ebf24e74d47c57cc0618bbb (pr25460.01 -> pr25460.02, diff):

addressed @MarcoFalke's comment:

However, I think our windows docs should match the windows CI.

addressed @sipsorcery's comment:

nm, forgot to update PlatformToolset :)

I find myself doing that everytime I do a build. Maybe this PR is a good time to udate the default?

sipsorcery commented at 10:35 AM on June 26, 2022: member

reACK 05b2d9fe076233961ebf24e74d47c57cc0618bbb.

DrahtBot commented at 4:42 PM on June 26, 2022: member

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#25472 (build: Increase MS Visual Studio minimum version by hebasto)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

jarolrod commented at 3:32 AM on June 27, 2022: member

ACK 05b2d9fe076233961ebf24e74d47c57cc0618bbb

Changes look good to me, makes sense to update as visual studio 2019 will "will go out of support in October 2022". PR description could state some of the motivation for the update.

hebasto commented at 5:21 AM on June 27, 2022: member

ACK 05b2d9f

Changes look good to me, makes sense to update as visual studio 2019 will "will go out of support in October 2022". PR description could state some of the motivation for the update.

PR description has been just added.

MarcoFalke merged this on Jun 27, 2022

MarcoFalke closed this on Jun 27, 2022

hebasto deleted the branch on Jun 27, 2022

fanquake referenced this in commit 2111f32f2a on Jun 27, 2022

sidhujag referenced this in commit 36516c03c9 on Jun 27, 2022

MarcoFalke referenced this in commit 3a230f4ce1 on Oct 2, 2022

DrahtBot locked this on Jun 27, 2023