Skip to content

fix: [CI] Fix windows building env issue.#691

Merged
lzwind merged 2 commits intolinuxdeepin:masterfrom
re2zero:bugfix
Oct 30, 2025
Merged

fix: [CI] Fix windows building env issue.#691
lzwind merged 2 commits intolinuxdeepin:masterfrom
re2zero:bugfix

Conversation

@re2zero
Copy link
Contributor

@re2zero re2zero commented Oct 29, 2025

The Windows Server 2019 image has been removed as of 2025-06-30, use windows-2022.

Log: Fix windows building env issue.

Summary by Sourcery

CI:

  • Replace os: windows-2019 with os: windows-2022 in the GitHub Actions Windows build matrix

@sourcery-ai
Copy link

sourcery-ai bot commented Oct 29, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

The pull request updates the Windows build environment in GitHub Actions by switching the OS image from windows-2019 to windows-2022 to resolve the CI build failure.

File-Level Changes

Change Details Files
Updated Windows build environment image in CI workflow
  • Changed matrix os value from windows-2019 to windows-2022
.github/workflows/windows-msvc.yml

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey there - I've reviewed your changes and they look great!


Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@re2zero re2zero force-pushed the bugfix branch 19 times, most recently from 5f5f249 to 80149c2 Compare October 30, 2025 10:55
The Windows Server 2019 image has been removed as of 2025-06-30, use windows-2022.

Log: Fix windows building env issue.
Update version to 1.1.22

Log: Update version to 1.1.22
@github-actions
Copy link

TAG Bot

TAG: 1.1.22
EXISTED: no
DISTRIBUTION: unstable

@deepin-ci-robot
Copy link

deepin pr auto review

我来对这个Git diff进行全面的代码审查:

  1. CI配置改进 (windows-msvc.yml):
  • 积极方面:

    • 升级到Windows 2022和VS2022,获得更好的性能和最新功能
    • 增加了详细的OpenSSL环境初始化和验证
    • 改进了错误处理和日志输出
    • 使用OpenSSL 3.x替代旧版本
  • 建议改进:

    • 应该将OpenSSL路径设置为环境变量,而不是硬编码
    • CMake版本3.31.5似乎是一个未来版本,建议使用稳定版本
    • 建议添加缓存清理机制,避免旧的构建产物影响
  1. Qt6兼容性改进:
  • 积极方面:

    • 正确处理了Qt5/Qt6的条件编译
    • 替换了已弃用的API(如QMatrix->QTransform)
    • 适当处理了编码相关的API变更
  • 建议改进:

    • 可以考虑使用Qt的版本检查宏来简化条件编译
    • 某些Qt6的变更可能需要更详细的迁移说明
  1. Windows特定代码改进:
  • 积极方面:

    • 替换了QtWin::fromHICON的实现
    • 改进了nativeEvent的签名以适配Qt6
    • 增加了更多的错误检查和日志
  • 建议改进:

    • 图标转换的替代实现较复杂,建议封装成独立函数
    • RegEnumKeyExA的使用可能需要考虑Unicode支持
  1. CMake配置改进:
  • 积极方面:

    • 正确处理了Qt5/Qt6的组件差异
    • 改进了库链接的条件处理
  • 建议改进:

    • 可以考虑使用更现代的CMake特性
    • 建议添加更多的编译选项检查
  1. 安全性改进:
  • 积极方面:

    • 升级到OpenSSL 3.x
    • 增加了更多的输入验证
  • 建议改进:

    • 需要确保所有文件操作都有适当的权限检查
    • 建议添加更多的安全编译选项

总体建议:

  1. 考虑将版本相关的配置集中管理
  2. 添加更多的单元测试来验证新实现
  3. 考虑添加性能基准测试
  4. 建议添加更多的文档说明,特别是关于Qt6迁移的部分
  5. 考虑使用更现代的C++特性来简化一些实现

这些更改总体上是积极和必要的,特别是对Qt6和最新工具链的支持。但需要注意一些细节的实现和测试。

@lzwind lzwind merged commit 8b7eb75 into linuxdeepin:master Oct 30, 2025
16 of 18 checks passed
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: lzwind, re2zero

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants