torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'bug32402_042' into bug32402_master

Browse Source 
Merge changes from master with shellcheck fixes.
This commit is contained in:
teor
2019-11-06 16:14:06 +10:00
parent 9ca25f3a68 7f23d47f72
commit f7b45975bf
6 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/git/git-merge-forward.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
SCRIPT_NAME=`basename $0`
SCRIPT_NAME=$(basename "$0")
function usage()
{
scripts/git/git-pull-all.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
SCRIPT_NAME=`basename $0`
SCRIPT_NAME=$(basename "$0")
function usage()
{
scripts/git/git-push-all.sh
+13 -8
View File
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
SCRIPT_NAME=`basename $0`
SCRIPT_NAME=$(basename "$0")
function usage()
{
@@ -257,7 +257,7 @@ if [ "$PUSH_SAME" -eq 0 ]; then
fi
done
if [ "$SKIP_UPSTREAM" ]; then
printf "Skipping unchanged: %s matching remote: %s\n" \
printf "Skipping unchanged: %s matching remote: %s\\n" \
"$b" "$SKIP_UPSTREAM"
else
if [ "$NEW_PUSH_BRANCHES" ]; then
@@ -287,18 +287,23 @@ if [ "$PUSH_DELAY" -le 0 ]; then
$GIT_PUSH "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES
else
# Push the branches in optimal CI order, with a delay between each push
PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V)
MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) \
PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | sort -V)
MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep master) \
|| true # Skipped master branch
if [ -z "$TEST_BRANCH_PREFIX" ]; then
MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) \
MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep maint) \
|| true # Skipped all maint branches
RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \
tr "\n" " ") || true # Skipped all release branches
RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep release | \
tr "\\n" " ") || true # Skipped all release branches
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"
else
# Actually test branches based on maint branches
MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep -v master) \
MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep -v master) \
|| true # Skipped all maint test branches
printf "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n" \
"$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES"
# No release branches
RELEASE_BRANCHES=
fi