Skip to content

Conversation

@d-ronnqvist
Copy link
Contributor

@d-ronnqvist d-ronnqvist commented Dec 12, 2025

Reverts #1392


Now that swiftlang/swift#85995 is merged, and DocC once again included in the Windows build, the changes in #1383 shouldn't have any impact on the Windows tests anymore. I'm verifying that with a cross-repo test (in swiftlang/swift#84510 (comment)) but it takes few hours to run.


Like I said in my original review of #818 and my later PR to revert it:

I really don't think that any integration that can cause blocking CI failures for the toolchain should be merged again until after DocC has a Windows CI. I feel that the only correct order to do add DocC to the Windows build is:

  1. Add the CMake files to the DocC repo
  2. Set up a Windows CI for DocC
  3. Integrate DocC into the Windows build

If we keep trying to skip step 2 I think it's better to undo step 1 by merging #1353 so that step 1 and 2 can be added back together before step 3.

@d-ronnqvist
Copy link
Contributor Author

@swift-ci please test

@d-ronnqvist
Copy link
Contributor Author

The cross-repo build for this passes for the Windows CI, so we're good to merge this again.

Screenshot 2025-12-12 at 14 59 15

@d-ronnqvist d-ronnqvist merged commit fd549d4 into main Dec 12, 2025
2 checks passed
@d-ronnqvist d-ronnqvist deleted the revert-1392-revert-1383-output-html-integrate-1 branch December 12, 2025 14:45
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