Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ jobs:
name: Publish
runs-on: ubuntu-latest
needs: test
permissions:
contents: write
steps:
- uses: actions/checkout@v4

Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ exclude = [
]

[workspace.package]
version = "0.3.0"
version = "0.4.0"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/colinrozzi/pack"

[workspace.dependencies]
packr-abi = { version = "0.3.0", path = "crates/pack-abi", default-features = false }
packr-derive = { version = "0.3.0", path = "crates/pack-derive" }
packr-guest = { version = "0.3.0", path = "crates/pack-guest" }
packr-guest-macros = { version = "0.3.0", path = "crates/pack-guest-macros" }
packr-abi = { version = "0.4.0", path = "crates/pack-abi", default-features = false }
packr-derive = { version = "0.4.0", path = "crates/pack-derive" }
packr-guest = { version = "0.4.0", path = "crates/pack-guest" }
packr-guest-macros = { version = "0.4.0", path = "crates/pack-guest-macros" }

[package]
name = "packr"
Expand Down
17 changes: 7 additions & 10 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

packages.default = pkgs.rustPlatform.buildRustPackage {
pname = "packr";
version = "0.3.0";
version = "0.4.0";

src = ./.;

Expand Down Expand Up @@ -139,21 +139,18 @@
echo "Updated to v$NEW"
echo ""

# Commit and tag with jj
# Commit and tag
if command -v jj &>/dev/null; then
jj describe -m "release v$NEW"
jj bookmark create "v$NEW" -r @ 2>/dev/null || jj bookmark set "v$NEW" -r @
jj git push --bookmark "v$NEW" --allow-new

# Also push main forward
jj new
jj bookmark set main -r @-
jj git push --bookmark main
# Use git directly for the tag — jj bookmarks are branches, not tags
COMMIT=$(jj log -r @ --no-graph -T 'commit_id' 2>/dev/null)
${pkgs.git}/bin/git tag "v$NEW" "$COMMIT"
${pkgs.git}/bin/git push origin "refs/tags/v$NEW"
else
git add -A
git commit -m "release v$NEW"
git tag "v$NEW"
git push origin main "v$NEW"
git push origin "refs/tags/v$NEW"
fi

echo ""
Expand Down
Loading