fix(ci): resolve merge conflict markers in publish workflow - #109
Open
tembo[bot] wants to merge 1 commit into
Open
fix(ci): resolve merge conflict markers in publish workflow#109tembo[bot] wants to merge 1 commit into
tembo[bot] wants to merge 1 commit into
Conversation
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.
Summary
PR #103 ("Configure OSS publishing") was merged to master with unresolved Git merge conflict markers in
.github/workflows/publish.yml. This leaves the publish workflow with invalid YAML — it will fail when a version tag is pushed.Root Cause
The merge commit
a0d6204introduced two unresolved conflict regions inpublish.yml:actions/checkoutversion — conflict between@v6(HEAD) and@v5(PR branch). Resolved to@v6(newer, aligns with the PR's stated intent to update action versions).pnpm auth token configuration — HEAD had no auth token lines; the PR branch added
pnpm config setlines for both npm and GitHub Packages registries. Resolved to keep the auth token lines, as they are required for the dual-registrypnpm publishstep that PR Configure OSS publishing #103 introduced.Note on Dependabot Updates workflow failure
The triggering CI failure was in the Dependabot Updates workflow (
dynamic/dependabot/dependabot-updates), which failed with "Dependabot encountered an error performing the update." This is a Dependabot infrastructure failure (the updater's own internal error while processing apostcsstransitive dependency update) — not a code issue. No repository changes can fix it; re-running the Dependabot update should resolve it.The merge conflict markers in
publish.ymlare a separate issue discovered during investigation. No conflict markers were found inpackage.json,pnpm-lock.yaml, or any source files.