Skip to content

fix(ci): bump cargo before npm in package-release #212

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.

Sign up for GitHub

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

Merged
thedavidmeister merged 1 commit into from
May 12, 2026
Merged

fix(ci): bump cargo before npm in package-release #212

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions .github/workflows/package-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,27 +65,24 @@ jobs:
echo "old=$OLD" >> $GITHUB_OUTPUT
echo "new=$NEW" >> $GITHUB_OUTPUT
if [ "$OLD" = "$NEW" ]; then echo "changed=false" >> $GITHUB_OUTPUT; else echo "changed=true" >> $GITHUB_OUTPUT; fi
# NPM version bump + tag (no push yet — batch with cargo)
# Cargo first — cargo-release refuses to run if the working tree is
# dirty, and it makes its own commit.
- name: Bump Cargo version
if: ${{ steps.cargo.outputs.changed == 'true' }}
run: |
nix develop -c cargo release --no-confirm --execute --no-tag --no-push -p rain-math-float alpha
echo "CARGO_VERSION=v$(cargo pkgid -p rain-math-float | cut -d@ -f2)" >> $GITHUB_ENV
# NPM second — npm version edits files but doesn't commit.
- name: Bump NPM version
if: ${{ steps.npm.outputs.changed == 'true' }}
run: |
NEW=$(npm version prerelease --preid alpha --no-git-tag-version)
echo "NPM_VERSION=$NEW" >> $GITHUB_ENV
git add package.json package-lock.json
# Cargo version bump + tag (no push yet — batch with npm)
- name: Bump Cargo version
if: ${{ steps.cargo.outputs.changed == 'true' }}
run: |
nix develop -c cargo release --no-confirm --execute --no-tag --no-push -p rain-math-float alpha
echo "CARGO_VERSION=v$(cargo pkgid -p rain-math-float | cut -d@ -f2)" >> $GITHUB_ENV
# Single push of both bump commits (cargo-release made its own commit;
# the npm bump is staged into a separate commit here).
- name: Commit and push version bumps
git commit -m "Package Release npm-${NEW}"
- name: Tag and push
if: ${{ steps.npm.outputs.changed == 'true' || steps.cargo.outputs.changed == 'true' }}
run: |
if [ "${{ steps.npm.outputs.changed }}" = "true" ]; then
git commit -m "Package Release npm-${{ env.NPM_VERSION }}"
fi
if [ -n "${{ env.NPM_VERSION }}" ]; then git tag npm-${{ env.NPM_VERSION }}; fi
if [ -n "${{ env.CARGO_VERSION }}" ]; then git tag crate-${{ env.CARGO_VERSION }}; fi
git push origin main
Expand Down
Loading