Skip to content

fix(ci): resolve ci.yml merge conflicts and action ref syntax#574

Merged
KooshaPari merged 1 commit into
mainfrom
fix/ci-yaml-merge-conflict
Jun 1, 2026
Merged

fix(ci): resolve ci.yml merge conflicts and action ref syntax#574
KooshaPari merged 1 commit into
mainfrom
fix/ci-yaml-merge-conflict

Conversation

@KooshaPari

@KooshaPari KooshaPari commented Jun 1, 2026

Copy link
Copy Markdown
Owner

User description

Fixes workflow-load failure: git conflict markers left in ci.yml and invalid @sha@sha checkout refs.

Made with Cursor


Note

Low Risk
CI-only workflow edits with no application runtime or security logic changes.

Overview
Repairs .github/workflows/ci.yml so GitHub Actions can load and run again after broken merge resolution left conflict markers and invalid action pins.

Action references now use a single commit SHA with a version comment (# v6.0.2, # v6.9.0, # v5.0.0) instead of duplicated @sha@sha strings on checkout and setup-node.

The npm staging step keeps CODEX_VERSION=0.115.0 (upstream) and still uploads the artifact only when staging succeeds via if: steps.stage_npm_package.outcome == 'success', using actions/upload-artifact@043fb46d....

Reviewed by Cursor Bugbot for commit 084657b. Bugbot is set up for automated code reviews on this repo. Configure here.


CodeAnt-AI Description

Restore the CI workflow so builds can run again

What Changed

  • Fixed broken merge-conflict leftovers in the CI workflow so GitHub Actions can load it again
  • Corrected the action references so dependency checkout, Node setup, and artifact upload use valid pinned versions
  • Kept npm staging on the newer release version, and still upload the package artifact only after staging succeeds

Impact

✅ CI runs without workflow load failures
✅ Fewer broken release staging jobs
✅ Reliable npm package artifact uploads

💡 Usage Guide

Checking Your Pull Request

Every time you make a pull request, our system automatically looks through it. We check for security issues, mistakes in how you're setting up your infrastructure, and common code problems. We do this to make sure your changes are solid and won't cause any trouble later.

Talking to CodeAnt AI

Got a question or need a hand with something in your pull request? You can easily get in touch with CodeAnt AI right here. Just type the following in a comment on your pull request, and replace "Your question here" with whatever you want to ask:

@codeant-ai ask: Your question here

This lets you have a chat with CodeAnt AI about your pull request, making it easier to understand and improve your code.

Example

@codeant-ai ask: Can you suggest a safer alternative to storing this secret?

Preserve Org Learnings with CodeAnt

You can record team preferences so CodeAnt AI applies them in future reviews. Reply directly to the specific CodeAnt AI suggestion (in the same thread) and replace "Your feedback here" with your input:

@codeant-ai: Your feedback here

This helps CodeAnt AI learn and adapt to your team's coding style and standards.

Example

@codeant-ai: Do not flag unused imports.

Retrigger review

Ask CodeAnt AI to review the PR again, by typing:

@codeant-ai: review

Check Your Repository Health

To analyze the health of your code repository, visit our dashboard at https://app.codeant.ai. This tool helps you identify potential issues and areas for improvement in your codebase, ensuring your repository maintains high standards of code health.

@gemini-code-assist

Copy link
Copy Markdown

Warning

You have reached your daily quota limit. Please wait up to 24 hours and I will start processing your requests again!

@codeant-ai

codeant-ai Bot commented Jun 1, 2026

Copy link
Copy Markdown

CodeAnt AI is reviewing your PR.


Thanks for using CodeAnt! 🎉

We're free for open-source projects. if you're enjoying it, help us grow by sharing.

Share on X ·
Reddit ·
LinkedIn

@codeant-ai codeant-ai Bot added the size:XS This PR changes 0-9 lines, ignoring generated files label Jun 1, 2026
@codeant-ai

codeant-ai Bot commented Jun 1, 2026

Copy link
Copy Markdown

CodeAnt AI finished reviewing your PR.

@KooshaPari KooshaPari merged commit 62ae525 into main Jun 1, 2026
8 of 11 checks passed
@KooshaPari KooshaPari deleted the fix/ci-yaml-merge-conflict branch June 1, 2026 05:13
@kilo-code-bot

kilo-code-bot Bot commented Jun 1, 2026

Copy link
Copy Markdown

Kilo Code Review could not run — your account is out of credits.

Add credits or switch to a free model to enable reviews on this change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS This PR changes 0-9 lines, ignoring generated files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant