geteduroam/geteduroam-ops
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

A newer bump-tag

Browse source
This commit is contained in:
Micke Nordin 2023-07-12 16:29:42 +02:00 committed by Johan Wassberg
parent 3aac1f97d8
commit 6ac9294dea
1 changed files with 39 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
bump-tag
View file

@ -2,21 +2,22 @@
set -e set -e
test -f cosmos.conf && . ./cosmos.conf
echo "Fetching any updates from server:" echo "Fetching any updates from server:"
git pull git pull
echo "" echo ""
if [[ -z $1 ]]; then if [[ -f ./cosmos.conf ]]; then
deftag=$(basename "$PWD") . ./cosmos.conf
fi
if [[ -z ${1} ]]; then
deftag=$(basename "${PWD}")
else else
deftag="$1" deftag="${1}"
fi fi
tagpfx=${tag:="${deftag}"} tagpfx=${tag:="${deftag}"}
last_tag=$(git tag -l "${tagpfx}-*" | sort | tail -1) last_tag=$(git tag -l "${tagpfx}-*" | sort | tail -1)
if [[ -n ${last_tag} ]]; then
echo "Verifying last tag ${last_tag}:" echo "Verifying last tag ${last_tag}:"
(git tag -v "${last_tag}" | grep ^gpg:) || true (git tag -v "${last_tag}" | grep ^gpg:) || true
# again to not mask exit status of git with grep # again to not mask exit status of git with grep
@ -24,13 +25,12 @@ git tag -v "${last_tag}" >/dev/null 2>&1
echo "" echo ""
echo "Differences between tag ${last_tag} and what you are about to sign:" echo "Differences between tag ${last_tag} and what you are about to sign:"
this_branch=$(git rev-parse --abbrev-ref HEAD) env PAGER=cat git diff --color "${last_tag}..main"
env PAGER=cat git diff --color "${last_tag}..${this_branch}"
iter=1 iter=1
ok= ok=
while test -z "$ok"; do while test -z "$ok"; do
this_tag=$(date "+${tagpfx}-%Y-%m-%d-v$(printf "%02d" $iter)") this_tag=$(date "+${tagpfx}-%Y-%m-%d-v$(printf "%02d" ${iter})")
iter=$(( iter + 1)) iter=$(( iter + 1))
case $( ( case $( (
echo "${this_tag}" echo "${this_tag}"
@ -44,17 +44,22 @@ while test -z "$ok"; do
esac esac
done done
if [[ "${deftag}" != "${tagpfx}" ]]; then if [ "${deftag}" != "${tagpfx}" ]; then
echo -e "Using new tag \e[94m${this_tag}\e[0m according to pattern in cosmos.conf" echo -e "Using new tag \e[94m${this_tag}\e[0m according to pattern in cosmos.conf"
else else
echo -e "Using new tag \e[94m${this_tag}\e[0m" echo -e "Using new tag \e[94m${this_tag}\e[0m"
fi fi
echo -e "\e[1mONLY SIGN IF YOU APPROVE OF VERIFICATION AND DIFF ABOVE\e[0m" echo -e "\e[1mONLY SIGN IF YOU APPROVE OF VERIFICATION AND DIFF ABOVE\e[0m"
else
echo -e "\e[1mCOULD NOT FIND LAST TAG, ASSUMING NEW TAG\e[0m"
iter=1
this_tag=$(date "+${tagpfx}-%Y-%m-%d-v$(printf "%02d" ${iter})")
fi
# GITTAGEXTRA is for putting things like "-u 2117364A" # GITTAGEXTRA is for putting things like "-u 2117364A"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
git tag ${GITTAGEXTRA} -m bump. -s "${this_tag}" git tag ${GITTAGEXTRA} -s "${this_tag}" -m bump.
git push git push
git push --tags git push --tags