From 2a6431e4ae92b4a75002209147edc73930df844f Mon Sep 17 00:00:00 2001 From: colin Date: Mon, 27 Apr 2026 21:30:37 -0400 Subject: [PATCH 1/3] release v0.3.0 From 1668ccbd987c5b5d66e2139de66cac70b64a7153 Mon Sep 17 00:00:00 2001 From: colin Date: Mon, 27 Apr 2026 21:33:22 -0400 Subject: [PATCH 2/3] release v0.4.0 --- Cargo.lock | 10 +++++----- Cargo.toml | 10 +++++----- flake.nix | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3993b40..491aec7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -786,7 +786,7 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "packr" -version = "0.3.0" +version = "0.4.0" dependencies = [ "anyhow", "clap", @@ -804,7 +804,7 @@ dependencies = [ [[package]] name = "packr-abi" -version = "0.3.0" +version = "0.4.0" dependencies = [ "hashbrown 0.14.5", "packr-derive", @@ -814,7 +814,7 @@ dependencies = [ [[package]] name = "packr-derive" -version = "0.3.0" +version = "0.4.0" dependencies = [ "proc-macro2", "quote", @@ -823,7 +823,7 @@ dependencies = [ [[package]] name = "packr-guest" -version = "0.3.0" +version = "0.4.0" dependencies = [ "dlmalloc", "packr-abi", @@ -833,7 +833,7 @@ dependencies = [ [[package]] name = "packr-guest-macros" -version = "0.3.0" +version = "0.4.0" dependencies = [ "packr-abi", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index dae8463..9f9aceb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/flake.nix b/flake.nix index d4fc891..7a9f4d9 100644 --- a/flake.nix +++ b/flake.nix @@ -72,7 +72,7 @@ packages.default = pkgs.rustPlatform.buildRustPackage { pname = "packr"; - version = "0.3.0"; + version = "0.4.0"; src = ./.; From 1e47385b9044099642326ab189785c26152b7ec1 Mon Sep 17 00:00:00 2001 From: colin Date: Mon, 27 Apr 2026 21:54:38 -0400 Subject: [PATCH 3/3] fix release workflow permissions and release script tag handling --- .github/workflows/publish.yml | 2 ++ flake.nix | 15 ++++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a010e8e..866697b 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -35,6 +35,8 @@ jobs: name: Publish runs-on: ubuntu-latest needs: test + permissions: + contents: write steps: - uses: actions/checkout@v4 diff --git a/flake.nix b/flake.nix index 7a9f4d9..aedec2f 100644 --- a/flake.nix +++ b/flake.nix @@ -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 ""