Skip to content

Add source build patch support to VMR manager#1989

Merged
premun merged 6 commits intodotnet:mainfrom
premun:prvysoky/source-build-patches
Aug 25, 2022
Merged

Add source build patch support to VMR manager#1989
premun merged 6 commits intodotnet:mainfrom
premun:prvysoky/source-build-patches

Conversation

@premun
Copy link
Member

@premun premun commented Aug 24, 2022

Handles Source Build patches during initialization/synchronization of the VMR

Expects a new property in source-mappings.json pointing to where the patches are located in the VMR (later they can be moved):

{
    "patchesPath": "src/installer/src/SourceBuild/tarball/patches",
    ...
}

Consider we're updating repo A from sha1 to sha2, the new synchronization algorithm is as follows:

  1. Checkout VMR
  2. Clone individual repo A to temp
  3. For each file that has a patch in the VMR, copy its sha1 version from the clone to the VMR (to working tree only)
  4. Prepare a diff from A for sha1..sha2 and apply it onto the VMR
  5. Apply any Source Build patches associated with the repo
  6. Commit all above to the VMR

Resolves dotnet/arcade#10261

@premun premun requested a review from oleksandr-didyk August 25, 2022 07:16
@premun premun merged commit af1ca58 into dotnet:main Aug 25, 2022
@premun premun deleted the prvysoky/source-build-patches branch August 25, 2022 08:04
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.

Handle source build patches

2 participants