Skip to content

Commit f851fa5

Browse files
committed
Print useful messages when tagging a commit not on main
1 parent 176f66b commit f851fa5

2 files changed

Lines changed: 18 additions & 7 deletions

File tree

.github/workflows/wheels-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build Wheels and Release
33
on:
44
push:
55
tags:
6-
- "*"
6+
- "userauth-*"
77
workflow_dispatch: {}
88

99
permissions:

scripts/create-release-tag.sh

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ set -euo pipefail
44

55
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
66
TAG_PREFIX="userauth"
7+
CYAN=$'\033[36m'
78
YELLOW=$'\033[33m'
9+
RED=$'\033[31m'
810
RESET=$'\033[0m'
911

1012
if ! command -v git >/dev/null 2>&1; then
@@ -16,9 +18,10 @@ CURRENT_BRANCH="$(git -C "$ROOT_DIR" rev-parse --abbrev-ref HEAD)"
1618
COMMIT_SHA="$(git -C "$ROOT_DIR" rev-parse --short HEAD)"
1719
MAX_RELEASE_NUM="$(
1820
git -C "$ROOT_DIR" tag --list "${TAG_PREFIX}-*" \
19-
| awk -F '-' '
20-
$1 "-" $2 == "ooniauth-py" && $NF ~ /^[0-9]+$/ {
21-
if ($NF > max) max = $NF
21+
| awk -v prefix="${TAG_PREFIX}-" '
22+
index($0, prefix) == 1 && match($0, /-([0-9]+)$/, m) {
23+
release_num = m[1] + 0
24+
if (release_num > max) max = release_num
2225
}
2326
END { print max + 0 }
2427
'
@@ -39,11 +42,19 @@ fi
3942
echo "Release tag preview:"
4043
echo " Tag scheme: ${TAG_PREFIX}-<shortsha>-<release_number>"
4144
echo " Release number: $NEXT_RELEASE_NUM"
42-
echo " Tag: ${YELLOW}${TAG_NAME}${RESET}"
43-
echo " Branch: $CURRENT_BRANCH"
45+
echo " Tag: ${CYAN}${TAG_NAME}${RESET}"
46+
if [[ "$CURRENT_BRANCH" == "main" ]]; then
47+
echo " Branch: $CURRENT_BRANCH"
48+
else
49+
echo " Branch: ${RED}${CURRENT_BRANCH} (WARNING: not main)${RESET}"
50+
fi
4451
echo " Commit: $COMMIT_SHA"
4552
echo
46-
read -r -p "Create and push tag $TAG_NAME to origin? [y/N] " answer
53+
if [[ "$CURRENT_BRANCH" != "main" ]]; then
54+
printf "%b\n" " ${YELLOW}WARNING: current branch is '$CURRENT_BRANCH' (not main): commit $COMMIT_SHA may not be on main${RESET}"
55+
fi
56+
57+
read -r -p "Create and push tag ${CYAN} $TAG_NAME ${RESET} to origin? [y/N] " answer
4758

4859
case "$answer" in
4960
y|Y|yes|YES)

0 commit comments

Comments
 (0)