Drive/k8s-manifests
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix shellcheck and use anotated tag

Browse source
This commit is contained in:
Micke Nordin 2023-06-09 10:56:55 +02:00
parent bf3bf6aa24
commit 8718d66556
Signed by untrusted user: Micke
GPG key ID: 0DA0A7A5708FE257
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
bump-tag
View file

@ -2,55 +2,56 @@
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 [ "x$1" = "x" ]; then if [[ -z ${1} ]]; then
deftag=`basename $PWD` 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)
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
git tag -v $last_tag > /dev/null 2>&1 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:"
PAGER=cat git diff --color $last_tag..main env PAGER=cat git diff --color "${last_tag}..main"
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=`expr $iter + 1` iter=$(( iter + 1))
case `(echo $this_tag; echo $last_tag) | sort | tail -1` in case $( (
$last_tag) echo "${this_tag}"
;; echo "${last_tag}"
$this_tag) ) | sort | tail -1) in
ok=yes "${last_tag}") ;;
;;
esac "${this_tag}")
ok=yes
;;
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"
# GITTAGEXTRA is for putting things like "-u 2117364A" # GITTAGEXTRA is for putting things like "-u 2117364A"
# shellcheck disable=SC2086
git tag $GITTAGEXTRA -m bump. -s $this_tag git tag ${GITTAGEXTRA} -a "${this_tag}" -m bump. -s "${this_tag}"
git push git push
git push --tags git push --tags