Skip to content

Commit 6d95a25

Browse files
committed
release.sh: Drop version-bump commit logic
The release script previously ran git commit after bumping pkgver/pkgrel in PKGBUILD and dkms.conf. In practice the version bump is already committed earlier during the bump-aurgen-test cycle, so the commit inside release.sh was either a no-op or created a duplicate commit for the same version. Drop the git add + git commit block. The sed lines stay as an idempotency safety net, but release.sh no longer produces commits. Also reword the pre-tag prompt and the "local commit + tag exist" comment to match the new flow (tag only). Signed-off-by: Javier Tia <floss@jetm.me>
1 parent 59d69b8 commit 6d95a25

1 file changed

Lines changed: 5 additions & 13 deletions

File tree

release.sh

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -125,33 +125,25 @@ echo ""
125125
echo "Building package..."
126126
aurgen
127127

128-
# Show what will be committed
128+
# Show the (expected-empty) diff so the user can confirm tree is clean
129129
echo ""
130-
echo "Changes to commit:"
130+
echo "Working tree diff:"
131131
git diff --stat
132132

133133
# Confirm
134134
echo ""
135-
read -rp "Commit and release ${new_tag}? [y/N] " confirm
135+
read -rp "Release ${new_tag}? [y/N] " confirm
136136
if [[ "$confirm" != [yY] ]]; then
137137
echo "Aborted. Reverting version changes..."
138138
git checkout -- "$PKGBUILD" "$DKMS_CONF" .SRCINFO 2>/dev/null || true
139139
exit 1
140140
fi
141141

142-
# Commit (skip if version was already set before script ran)
143-
git add PKGBUILD dkms.conf .SRCINFO
144-
if git diff --cached --quiet; then
145-
echo "Version already set, no commit needed."
146-
else
147-
git commit -m "pkg: Release ${new_tag}"
148-
fi
149-
150142
# Tag
151143
git tag "${new_tag}"
152144

153-
# From here on, local commit + tag exist. Don't roll back PKGBUILD/dkms.conf
154-
# on subsequent failures - the user can retry the push steps manually.
145+
# From here on, the local tag exists. Don't roll back PKGBUILD/dkms.conf on
146+
# subsequent failures - the user can retry the push steps manually.
155147
release_committed=1
156148

157149
# Push to GitHub first (tag triggers GH Actions: release + RPM/DEB)

0 commit comments

Comments
 (0)