diff options
Diffstat (limited to 'scripts/git')
| -rwxr-xr-x | scripts/git/git-push-all.sh | 51 | ||||
| -rwxr-xr-x | scripts/git/pre-commit.git-hook | 4 |
2 files changed, 44 insertions, 11 deletions
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index 2030a600ff..1ae310eca4 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -1,11 +1,44 @@ #!/usr/bin/env bash -# The remote upstream branch on which git.torproject.org/tor.git points to. -UPSTREAM_BRANCH=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} - -git push "$UPSTREAM_BRANCH" \ - master \ - {release,maint}-0.4.1 \ - {release,maint}-0.4.0 \ - {release,maint}-0.3.5 \ - {release,maint}-0.2.9 +# Usage: git-push-all.sh +# env vars: TOR_UPSTREAM_REMOTE_NAME=upstream TOR_PUSH_DELAY=0 +# options: --no-atomic --dry-run (any other git push option) +# +# TOR_PUSH_DELAY pushes the master and maint branches separately, so that CI +# runs in a sensible order. +# push --atomic is the default when TOR_PUSH_DELAY=0, and for release branches. + +set -e + +# The upstream remote which git.torproject.org/tor.git points to. +UPSTREAM_REMOTE=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} +# Add a delay between pushes, so CI runs on the most important branches first +PUSH_DELAY=${TOR_PUSH_DELAY:-0} + +PUSH_BRANCHES=`echo \ + master \ + {release,maint}-0.4.1 \ + {release,maint}-0.4.0 \ + {release,maint}-0.3.5 \ + {release,maint}-0.2.9 \ + ` + +if [ "$PUSH_DELAY" -le 0 ]; then + echo "Pushing $PUSH_BRANCHES" + git push --atomic "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES +else + PUSH_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V` + MASTER_BRANCH=`echo "$PUSH_BRANCHES" | tr " " "\n" | grep master` + MAINT_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint` + RELEASE_BRANCHES=`echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ + tr "\n" " "` + printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n%s\n" \ + "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES" + git push "$@" "$UPSTREAM_REMOTE" $MASTER_BRANCH + sleep "$PUSH_DELAY" + for b in $MAINT_BRANCHES; do + git push "$@" "$UPSTREAM_REMOTE" $b + sleep "$PUSH_DELAY" + done + git push --atomic "$@" "$UPSTREAM_REMOTE" $RELEASE_BRANCHES +fi diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook index 37060fdbe8..b2a1847a2b 100755 --- a/scripts/git/pre-commit.git-hook +++ b/scripts/git/pre-commit.git-hook @@ -37,8 +37,8 @@ elif [ -d src/common ]; then src/tools/*.[ch] fi -if test -e scripts/maint/checkIncludes.py; then - python scripts/maint/checkIncludes.py +if test -e scripts/maint/practracker/includes.py; then + python scripts/maint/practracker/includes.py fi # Only call practracker if ${PT_DIR}/.enable_practracker_in_hooks exists |