Skip to content

windows_support: drop source_directory_headers.patch once upstream PR #23 is released #9212

Open

Description

@TrapsterDK

Part of #8912. Follow-up to #9135 (PR #9138), which added patches/windows_support/source_directory_headers.patch so the Windows SDK ucrt/shared/um/winrt include targets are source directories. Upstream: hermeticbuild/windows_support#22, PR hermeticbuild/windows_support#23 (open as of 2026-11-07).

Where

  • MODULE.bazel:187 (patch list and windows_support version)
  • cli/adopt/BUILD.bazel:88, cli/adopt/src/overrides.rs:366-368
  • patches/README.md:61
  • patches/windows_support/BUILD.bazel:2,9,12,18, patches/windows_support/source_directory_headers.patch, patches/windows_support/source_directory_headers_test.bzl
  • families/{android,apple,beam,dotnet,jvm}/third_party/rules_dx/ (BUILD.bazel, rules_dx.MODULE.bazel, windows_support.source_directory_headers.patch)

Fix

  1. Start only once a windows_support release contains PR De-milestone quality/ domain docs (#11) #23. Bump the windows_support bazel_dep to that release.
  2. Remove the patch from every file under Where. Keep source_directory_headers_test if it still passes against the release (it checks @windows_sdk//:winsdk_um_include is one source directory); move it out of patches/ if the patch directory becomes empty of patches.
  3. Regenerate the families with dx init --apply and update lockfiles with bazel mod deps --lockfile_mode=update (root and families).
  4. Run //patches/windows_support:source_directory_headers_test, //cli/adopt:dx_adopt_test, and one windows_arm64 evidence run (task=build scope=//cli/process/...) to confirm MerkleTreeComputer.buildForSpawn stays near 11 core-s.

Activity

  1. added
    P2Improve and finish existing features
    model:haikuAgent lane: mechanical fix, Haiku can implement
    on Nov 7, 2026
  2. TrapsterDK commented on Nov 7, 2026

    @TrapsterDK
    CollaboratorAuthor

    Blocked: hermeticbuild/windows_support PR #23 is still open and the latest release is v0.4.1, which does not contain it. Work resumes once a release includes the fix.

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

Metadata

Metadata

Assignees

No one assigned

    Labels

    P2Improve and finish existing featuresblockedWaiting on upstream or a design decisionmodel:haikuAgent lane: mechanical fix, Haiku can implement

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions