Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Look up previous builds during codeflow reconstruction #4352

Open
premun opened this issue Jan 21, 2025 · 0 comments
Open

Look up previous builds during codeflow reconstruction #4352

premun opened this issue Jan 21, 2025 · 0 comments

Comments

@premun
Copy link
Member

premun commented Jan 21, 2025

Context

During code flow, we sometimes need to recursively reconstruct a previous code-flow because of a conflict.
In this case we re-do the previous flow.
In #4166, we started also storing which build was flowing and so now we can re-construct the flow fully and update version files appropriately.

Goal

  • Look up the previous build that was flown in the flow we're reconstructing. Example place in code where this needs to happen:
    // TODO (https://github.com/dotnet/arcade-services/issues/4166): Find a previous build?
    new Build(-1, DateTimeOffset.Now, 0, false, false, lastLastFlow.SourceSha, [], [], [], []),
    (but generally around places where we deal with PatchApplicationFailedException).
  • Disable conflict resolution in such case, as merging the target branch would prevent to apply the current flow on top of the just reconstructed one.

Notes

More on the reconstruction can be seen here: https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Full-Code-Flow.md#conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: No status
Development

No branches or pull requests

1 participant