Skip to content

Commit 948f5de

Browse files
committed
Fix release script consistency issues
- Remove redundant git push --tags (gh release create handles tags) - Fix shellcheck SC2162: add -r flag to read command - Apply shfmt formatting
1 parent b22afdb commit 948f5de

File tree

1 file changed

+28
-30
lines changed

1 file changed

+28
-30
lines changed

dev-bin/release.sh

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@ set -eu -o pipefail
66
# before making any changes to the repository
77

88
check_command() {
9-
if ! command -v "$1" &> /dev/null; then
10-
echo "Error: $1 is not installed or not in PATH"
11-
exit 1
12-
fi
9+
if ! command -v "$1" &>/dev/null; then
10+
echo "Error: $1 is not installed or not in PATH"
11+
exit 1
12+
fi
1313
}
1414

1515
# Verify gh CLI is authenticated
16-
if ! gh auth status &> /dev/null; then
17-
echo "Error: gh CLI is not authenticated. Run 'gh auth login' first."
18-
exit 1
16+
if ! gh auth status &>/dev/null; then
17+
echo "Error: gh CLI is not authenticated. Run 'gh auth login' first."
18+
exit 1
1919
fi
2020

2121
# Verify we can access this repository via gh
22-
if ! gh repo view --json name &> /dev/null; then
23-
echo "Error: Cannot access repository via gh. Check your authentication and repository access."
24-
exit 1
22+
if ! gh repo view --json name &>/dev/null; then
23+
echo "Error: Cannot access repository via gh. Check your authentication and repository access."
24+
exit 1
2525
fi
2626

2727
# Verify git can connect to the remote (catches SSH key issues, etc.)
28-
if ! git ls-remote origin &> /dev/null; then
29-
echo "Error: Cannot connect to git remote. Check your git credentials/SSH keys."
30-
exit 1
28+
if ! git ls-remote origin &>/dev/null; then
29+
echo "Error: Cannot connect to git remote. Check your git credentials/SSH keys."
30+
exit 1
3131
fi
3232

3333
check_command perl
@@ -36,19 +36,19 @@ check_command uv
3636
# Check that we're not on the main branch
3737
current_branch=$(git branch --show-current)
3838
if [ "$current_branch" = "main" ]; then
39-
echo "Error: Releases should not be done directly on the main branch."
40-
echo "Please create a release branch and run this script from there."
41-
exit 1
39+
echo "Error: Releases should not be done directly on the main branch."
40+
echo "Please create a release branch and run this script from there."
41+
exit 1
4242
fi
4343

4444
# Fetch latest changes and check that we're not behind origin/main
4545
echo "Fetching from origin..."
4646
git fetch origin
4747

4848
if ! git merge-base --is-ancestor origin/main HEAD; then
49-
echo "Error: Current branch is behind origin/main."
50-
echo "Please merge or rebase with origin/main before releasing."
51-
exit 1
49+
echo "Error: Current branch is behind origin/main."
50+
echo "Please merge or rebase with origin/main before releasing."
51+
exit 1
5252
fi
5353

5454
changelog=$(cat HISTORY.rst)
@@ -62,24 +62,24 @@ regex='
6262
'
6363

6464
if [[ ! $changelog =~ $regex ]]; then
65-
echo "Could not find date line in change log!"
66-
exit 1
65+
echo "Could not find date line in change log!"
66+
exit 1
6767
fi
6868

6969
version="${BASH_REMATCH[1]}"
7070
date="${BASH_REMATCH[3]}"
7171
notes="$(echo "${BASH_REMATCH[4]}" | sed -n -E '/^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?/,$!p')"
7272

7373
if [[ "$date" != "$(date +"%Y-%m-%d")" ]]; then
74-
echo "$date is not today!"
75-
exit 1
74+
echo "$date is not today!"
75+
exit 1
7676
fi
7777

7878
tag="v$version"
7979

8080
if [ -n "$(git status --porcelain)" ]; then
81-
echo ". is not clean." >&2
82-
exit 1
81+
echo ". is not clean." >&2
82+
exit 1
8383
fi
8484

8585
perl -pi -e "s/(?<=^version = \").+?(?=\")/$version/gsm" pyproject.toml
@@ -93,17 +93,15 @@ git diff
9393
echo $'\nRelease notes:'
9494
echo "$notes"
9595

96-
read -e -p "Commit changes and push to origin? " should_push
96+
read -r -e -p "Commit changes and push to origin? " should_push
9797

9898
if [ "$should_push" != "y" ]; then
99-
echo "Aborting"
100-
exit 1
99+
echo "Aborting"
100+
exit 1
101101
fi
102102

103103
git commit -m "Update for $tag" -a
104104

105105
git push
106106

107107
gh release create --target "$(git branch --show-current)" -t "$version" -n "$notes" "$tag"
108-
109-
git push --tags

0 commit comments

Comments
 (0)