-
Notifications
You must be signed in to change notification settings - Fork 183
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
Checked in code to some branch directly #1477
Conversation
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
Was chatting with @scbedd today about what the world would look like after we implement this change. We agreed that there is the potential for many releases at once to create merge conflicts (especially when simultaneously adding things to the same location in the same file many times concurrently. However, the The next release will be a good test of that retry loop. In cases where the push step fails despite the retry loop, simply re-running the job will likely result in success. In the case of an Onboarding branch we have 2 pushes and a partial success (one push succeeds, other fails) may result in noop pushes in retries but Our advice to anyone who sees failures in the docs.ms release job should be "let us know that it's happening so we can make adjustments to the implementation logic, retry the job once and it should succeed" |
Do we really think there will be that many conflicts? There might be other changes but hopefully not in the same file. If there are a lot of changes to the same files we might need to see if we can find a way to potentially separate them in some way to avoid conflicts. The retry logic will help for concurrent pushes and some basic conflicts but if there are files touching lines next to each other in the same files this retry logic will start to fall apart. |
The following pipelines have been queued for testing: |
Every release build has to touch the |
There are no such locking that I'm aware of and even if there was I would avoid trying to use it. As long as the likelihood of 2 jobs publishing to that file at the exact same time is pretty low we might be OK. HOwever if we can figure out some way to format the package.json file so that no 2 edits would be on exactly the same adjacent lines (i.e. maybe we could have some spacing or formatting between the often edit lines) then the retry would still mostly work. |
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
The following pipelines have been queued for testing: |
Hello @azure-sdk! Because this pull request has the p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (
|
Issue: Azure/azure-sdk#2470
Testing pipelines:
Java:https://dev.azure.com/azure-sdk/internal/_build/results?buildId=803251&view=logs&j=df6dbc9d-9cb6-55ac-00c8-bc457d14297a&t=c8a16bce-d539-5a96-ea44-10296799aa9d
.NET:https://dev.azure.com/azure-sdk/internal/_build/results?buildId=804860&view=logs&j=5ccebfdc-da53-51d4-fecb-9480b00e8628&t=d1513c7c-1e34-592b-a96a-fb941417aae9
Python:https://dev.azure.com/azure-sdk/internal/_build/results?buildId=803264&view=logs&j=ceb84d66-6af3-5d95-9875-cd812f26b59e&t=34564ed5-4e54-52a5-372d-3ee518ce2d7c
Js:https://dev.azure.com/azure-sdk/internal/_build/results?buildId=803253&view=logs&j=ceb84d66-6af3-5d95-9875-cd812f26b59e&t=8c18c00a-8976-5c3f-c4f5-8f07ce49366c