nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2

Browse Source
This commit is contained in:
teor 2019-11-06 21:28:28 +10:00
commit c3a1e15a5e
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
6 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug32402 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (shellcheck):
- Start checking most scripts for shellcheck errors again.
Fixes bug 32402; bugfix on 0.4.2.1-alpha.

3
changes/bug32402_git_scripts Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (shellcheck):
- Fix minor shellcheck errors in the git-*.sh scripts.
Fixes bug 32402; bugfix on 0.4.2.1-alpha.

2
scripts/git/git-merge-forward.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
SCRIPT_NAME=`basename $0` SCRIPT_NAME=$(basename "$0")
function usage() function usage()
{ {

2
scripts/git/git-pull-all.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
SCRIPT_NAME=`basename $0` SCRIPT_NAME=$(basename "$0")
function usage() function usage()
{ {

21
scripts/git/git-push-all.sh
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
SCRIPT_NAME=`basename $0` SCRIPT_NAME=$(basename "$0")
function usage() function usage()
{ {
@ -237,7 +237,7 @@ if [ "$PUSH_SAME" -eq 0 ] && [ "$TEST_BRANCH_PREFIX" ]; then
fi fi
done done
if [ "$SKIP_UPSTREAM" ]; then if [ "$SKIP_UPSTREAM" ]; then
printf "Skipping unchanged: %s remote: %s\n" \ printf "Skipping unchanged: %s remote: %s\\n" \
"$b" "$SKIP_UPSTREAM" "$b" "$SKIP_UPSTREAM"
else else
if [ "$NEW_PUSH_BRANCHES" ]; then if [ "$NEW_PUSH_BRANCHES" ]; then
@ -261,18 +261,19 @@ if [ "$PUSH_DELAY" -le 0 ]; then
$GIT_PUSH "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES $GIT_PUSH "$@" "$UPSTREAM_REMOTE" $PUSH_BRANCHES
else else
# Push the branches in optimal CI order, with a delay between each push # Push the branches in optimal CI order, with a delay between each push
PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | sort -V) PUSH_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | sort -V)
MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep master) MASTER_BRANCH=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep master)
if [ -z "$TEST_BRANCH_PREFIX" ]; then if [ -z "$TEST_BRANCH_PREFIX" ]; then
MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep maint) MAINT_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep maint)
RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\n" | grep release | \ RELEASE_BRANCHES=$(echo "$PUSH_BRANCHES" | tr " " "\\n" | grep release | \
tr "\n" " ") tr "\\n" " ")
printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n%s\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" "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$RELEASE_BRANCHES"
else else
# Actually test branches based on maint branches # 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)
printf "Pushing with %ss delays, so CI runs in this order:\n%s\n%s\n" \ printf "Pushing with %ss delays, so CI runs in this order:\\n%s\\n%s\\n" \
"$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES" "$PUSH_DELAY" "$MASTER_BRANCH" "$MAINT_BRANCHES"
# No release branches # No release branches
RELEASE_BRANCHES= RELEASE_BRANCHES=

6
scripts/maint/checkShellScripts.sh
View File

@ -35,12 +35,8 @@ if [ ! -d "$TOPLEVEL/src" ]; then
fi fi
# Check *.sh scripts, but ignore the ones that we can't fix # Check *.sh scripts, but ignore the ones that we can't fix
find "$TOPLEVEL" \ find "$TOPLEVEL/contrib" "$TOPLEVEL/doc" "$TOPLEVEL/scripts" "$TOPLEVEL/src" \
-name "*.sh" \ -name "*.sh" \
-path "$TOPLEVEL/contrib/*" \
-path "$TOPLEVEL/doc/*" \
-path "$TOPLEVEL/scripts/*" \
-path "$TOPLEVEL/src/*" \
-not -path "$TOPLEVEL/src/ext/*" \ -not -path "$TOPLEVEL/src/ext/*" \
-not -path "$TOPLEVEL/src/rust/registry/*" \ -not -path "$TOPLEVEL/src/rust/registry/*" \
-exec shellcheck {} + -exec shellcheck {} +