CI: fail fast on unresolved merge markers in uv.lock#254
Closed
Copilot wants to merge 2 commits into
Closed
Conversation
Copilot
AI
changed the title
[WIP] Copilot Request
CI: fail fast on unresolved merge markers in Jun 24, 2026
uv.lock
Collaborator
|
pretty cool that copilot can use PR template |
Contributor
|
@copilot who made this PR? |
Collaborator
|
@cophus I think I accidentally prompted this. I clicked "ask copilot to fix this" for an error. I am not sure we want this change. |
Collaborator
|
What was the error? We definitely don't want a situation where uv.lock has merge conflicts, but presumably the weekly cron job updating uv.lock should prevent devs from having to think much about the lock file. |
Collaborator
|
The error I get is in this PR: #204 in the python 3.12 project installation: More details here: |
Collaborator
|
PR closed, I did not mean to create it. Problem with uv.lock has been solved |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What problem this PR addreseses
The
ubuntu-latest / python 3.12Actions job fails at dependency install becauseuv sync --lockedcannot parseuv.lockwhen conflict markers are present. This PR adds an explicit preflight check so the workflow fails immediately with a clear diagnostic.Validate uv.lockstep in.github/workflows/uv-pytests.ymlbefore install.What should the reviewer(s) do
Review the new pre-install validation step in the pytest workflow and confirm the fail-fast behavior/error message is appropriate for lockfile integrity checks.