Skip to content

Commit 360b7fa

Browse files
committed
release: promote develop to main (publish=false fix)
2 parents 2c64d31 + f0a8919 commit 360b7fa

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

release-plz.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
[[package]]
1010
name = "katgpt-rs"
11-
release = false # never version-bump, never tag, never changelog, never publish
11+
release = false # never version-bump, never tag, never changelog
12+
publish = false # match Cargo.toml's publish = false (release-plz validates consistency)
1213

1314
[[package]]
1415
name = "katgpt-core"

scripts/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ git pull origin develop
8787
echo "→ promoting develop → main..."
8888
git checkout main
8989
git pull origin main
90-
git merge --ff-only develop
90+
git merge --no-ff develop -m "release: promote develop to main"
9191
git push origin main
9292

9393
# Switch back to develop for continued work

0 commit comments

Comments
 (0)