Skip to content

fix compaction step#539

Merged
khaliqgant merged 2 commits intomainfrom
fix-trajectories-compaction
Mar 11, 2026
Merged

fix compaction step#539
khaliqgant merged 2 commits intomainfrom
fix-trajectories-compaction

Conversation

@khaliqgant
Copy link
Copy Markdown
Member

@khaliqgant khaliqgant commented Mar 11, 2026

Summary

Test Plan

  • Tests added/updated
  • Manual testing completed

Screenshots


Open with Devin

Copy link
Copy Markdown
Contributor

@devin-ai-integration devin-ai-integration Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Devin Review found 1 potential issue.

View 2 additional findings in Devin Review.

Open in Devin Review

Comment thread .github/workflows/publish.yml Outdated
git commit -m "chore: compact trajectories for v${{ needs.build.outputs.new_version }}"
fi
# Discard any other unstaged changes (e.g. package-lock.json modified by npx)
git checkout -- . 2>/dev/null || true
Copy link
Copy Markdown
Contributor

@devin-ai-integration devin-ai-integration Bot Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔴 git checkout -- package-lock.json discards version-bumped package-lock.json, not just npx side-effects

git checkout -- package-lock.json restores the file to the HEAD (committed) version, but package-lock.json in the working tree was overwritten by the build artifact download (.github/workflows/publish.yml:906-910) which contains the version-bumped lockfile generated during the build step (.github/workflows/publish.yml:414-415). This means the command discards the legitimate version bump changes along with any npx side-effects. In the subsequent "Commit and tag" step (line 1187), git add package-lock.json will stage the old/un-bumped lockfile, causing the release commit to have a package.json with bumped versions but a package-lock.json that doesn't match.

Fix suggestion

Instead of reverting to HEAD, save the artifact version before npx runs and restore it after, or move the git checkout inside the if block and only restore if npx actually ran and modified it. A simpler approach: compare the lockfile before/after npx and only restore if npx changed it.

Open in Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

@khaliqgant khaliqgant merged commit 200be4e into main Mar 11, 2026
31 of 32 checks passed
@khaliqgant khaliqgant deleted the fix-trajectories-compaction branch March 11, 2026 08:48
khaliqgant added a commit that referenced this pull request Mar 25, 2026
* fix compaction step

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant