dn42/registry
1
0
Fork 0
mirror of https://git.dn42.dev/dn42/registry.git synced 2025-07-19 08:56:59 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add script to sign commits to allow for future automation

Browse source
This commit is contained in:
Simon Marsh 2021-05-02 13:17:30 +01:00
parent b7f9173f22
commit 2213186838
No known key found for this signature in database
GPG key ID: 0FCCD13AE1CF7ED8
2 changed files with 446 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

61
squash-my-commits
View file

@ -5,6 +5,9 @@
# with any changes in the main registry repository and will then squash
# the local changes together in to a single commit
#
# If the script fails to work, PRs for fixes are always welcome
# and you can always squash your commits manually
#
# use './squash-my-commits -S' to sign the result with your pgp key
#
##########################################################################
@ -13,10 +16,11 @@ usage()
{
echo "Usage: $0 [options]"
echo 'Options:'
echo ' -S, sign the result with your pgp key'
echo ' --push, force push result'
echo ' --ssh, use ssh to fetch from the registry'
echo ' --https, use https to fetch from the registry'
echo ' -S, sign the result with your pgp key'
echo ' --push, force push result'
echo ' --ssh, use ssh to fetch from the registry'
echo ' --https, use https to fetch from the registry'
echo ' --verify, check only'
echo 'Environment variables:'
echo ' DN42_REG_URL, set the registry URL to use'
}
@ -24,6 +28,9 @@ usage()
##########################################################################
# parse arguments
do_push=0
verify_only=0
for arg
do
case "$arg" in
@ -42,6 +49,9 @@ do
echo 'Forcing use of HTTPS to fetch from registry'
reg_proto="https"
;;
--verify)
verify_only=1
;;
--help)
usage
exit 0
@ -100,23 +110,29 @@ fi
##########################################################################
# ensure the local branch is up to date
echo 'Rebasing local changes against the registry master'
git fetch dn42registry master
if [ $? -ne 0 ]
if [ "$verify_only" -ne 1 ]
then
echo 'ERROR: Failed to fetch registry master branch'
echo 'Hint: you can use --ssh/--https to force use of ssh or https'
echo 'If all else fails, you can also set the DN42_REG_URL'
echo 'environment variable to directly specify the URL to fetch'
exit 1
# ensure the local branch is up to date
echo 'Rebasing local changes against the registry master'
git fetch dn42registry master
if [ $? -ne 0 ]
then
echo 'ERROR: Failed to fetch registry master branch'
echo 'Hint: you can use --ssh/--https to force use of ssh or https'
echo 'If all else fails, you can also set the DN42_REG_URL'
echo 'environment variable to directly specify the URL to fetch'
exit 1
fi
# fail on errors from here onwards
set -e
git rebase dn42registry/master
else
set -e
fi
# fail on errors from here onwards
set -e
git rebase dn42registry/master
##########################################################################
# find number of local commits
@ -129,6 +145,12 @@ then
exit 0
fi
if [ "$verify_only" -eq 1 ]
then
echo "$count local commits found"
exit 1
fi
echo 'Squashing $count commits ...'
# construct a new comment based on previous commits
@ -153,7 +175,8 @@ then
echo 'Force pushing changes'
git push --force
else
echo 'Remember to push your changes using: git push --force'
echo 'Remember to sign your commit: ./sign-my-commit FOO-MNT'
echo 'and then push your changes using: git push --force'
fi
##########################################################################