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

Merge branch 'tor-github/pr/1717'

Browse Source
This commit is contained in:
David Goulet 2020-02-11 10:52:49 -05:00
commit 2a524662c3
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,19 +94,19 @@ TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
MAINT_035_TB=( "maint-0.3.5" "" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" \ MAINT_035_TB=( "maint-0.3.5" "" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" \
"_035" "") "_035" "")
# Used in maint/release merge and test branch modes # Used in maint/release merge and test branch modes
MAINT_040=( "maint-0.4.0" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" \ MAINT_041=( "maint-0.4.1" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" \
"_040" "_035") "_041" "_035")
MAINT_041=( "maint-0.4.1" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" \
"_041" "_040")
MAINT_042=( "maint-0.4.2" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" \ MAINT_042=( "maint-0.4.2" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" \
"_042" "_041") "_042" "_041")
MAINT_MASTER=( "master" "maint-0.4.2" "$GIT_PATH/$TOR_MASTER_NAME" \ MAINT_043=( "maint-0.4.3" "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.3" \
"_master" "_042") "_043" "_042")
MAINT_MASTER=( "master" "maint-0.4.3" "$GIT_PATH/$TOR_MASTER_NAME" \
"_master" "_043")
RELEASE_035=( "release-0.3.5" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) RELEASE_035=( "release-0.3.5" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" )
RELEASE_040=( "release-0.4.0" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" )
RELEASE_041=( "release-0.4.1" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" ) RELEASE_041=( "release-0.4.1" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" )
RELEASE_042=( "release-0.4.2" "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.2" ) RELEASE_042=( "release-0.4.2" "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.2" )
RELEASE_043=( "release-0.4.3" "maint-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.3" )
# The master branch path has to be the main repository thus contains the # The master branch path has to be the main repository thus contains the
# origin that will be used to fetch the updates. All the worktrees are created # origin that will be used to fetch the updates. All the worktrees are created
@ -116,14 +116,14 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME"
# SC2034 -- shellcheck thinks that these are unused. We know better. # SC2034 -- shellcheck thinks that these are unused. We know better.
ACTUALLY_THESE_ARE_USED=<<EOF ACTUALLY_THESE_ARE_USED=<<EOF
${MAINT_035_TB[0]} ${MAINT_035_TB[0]}
${MAINT_040[0]}
${MAINT_041[0]} ${MAINT_041[0]}
${MAINT_042[0]} ${MAINT_042[0]}
${MAINT_043[0]}
${MAINT_MASTER[0]} ${MAINT_MASTER[0]}
${RELEASE_035[0]} ${RELEASE_035[0]}
${RELEASE_040[0]}
${RELEASE_041[0]} ${RELEASE_041[0]}
${RELEASE_042[0]} ${RELEASE_042[0]}
${RELEASE_043[0]}
EOF EOF
####################### #######################
@ -181,15 +181,15 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then
# maint branch # maint branch
RELEASE_035[@] RELEASE_035[@]
MAINT_040[@]
RELEASE_040[@]
MAINT_041[@] MAINT_041[@]
RELEASE_041[@] RELEASE_041[@]
MAINT_042[@] MAINT_042[@]
RELEASE_042[@] RELEASE_042[@]
MAINT_043[@]
RELEASE_043[@]
MAINT_MASTER[@] MAINT_MASTER[@]
) )
@ -203,12 +203,12 @@ else
# We want a test branch based on the earliest maint branch # We want a test branch based on the earliest maint branch
MAINT_035_TB[@] MAINT_035_TB[@]
MAINT_040[@]
MAINT_041[@] MAINT_041[@]
MAINT_042[@] MAINT_042[@]
MAINT_043[@]
MAINT_MASTER[@] MAINT_MASTER[@]
) )

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

@ -59,15 +59,15 @@ TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
# First set of arrays are the maint-* branch and then the release-* branch. # First set of arrays are the maint-* branch and then the release-* branch.
# New arrays need to be in the WORKTREE= array else they aren't considered. # New arrays need to be in the WORKTREE= array else they aren't considered.
MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" )
MAINT_040=( "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" )
MAINT_041=( "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" ) MAINT_041=( "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" )
MAINT_042=( "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" ) MAINT_042=( "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" )
MAINT_043=( "maint-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.3" )
MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" ) MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" )
RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" )
RELEASE_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" )
RELEASE_041=( "release-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" ) RELEASE_041=( "release-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" )
RELEASE_042=( "release-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.2" ) RELEASE_042=( "release-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.2" )
RELEASE_043=( "release-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.3" )
# The master branch path has to be the main repository thus contains the # The master branch path has to be the main repository thus contains the
# origin that will be used to fetch the updates. All the worktrees are created # origin that will be used to fetch the updates. All the worktrees are created
@ -77,14 +77,14 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME"
# SC2034 -- shellcheck thinks that these are unused. We know better. # SC2034 -- shellcheck thinks that these are unused. We know better.
ACTUALLY_THESE_ARE_USED=<<EOF ACTUALLY_THESE_ARE_USED=<<EOF
${MAINT_035[0]} ${MAINT_035[0]}
${MAINT_040[0]}
${MAINT_041[0]} ${MAINT_041[0]}
${MAINT_042[0]} ${MAINT_042[0]}
${MAINT_043[0]}
${MAINT_MASTER[0]} ${MAINT_MASTER[0]}
${RELEASE_035[0]} ${RELEASE_035[0]}
${RELEASE_040[0]}
${RELEASE_041[0]} ${RELEASE_041[0]}
${RELEASE_042[0]} ${RELEASE_042[0]}
${RELEASE_043[0]}
EOF EOF
########################### ###########################
@ -96,15 +96,15 @@ WORKTREE=(
MAINT_035[@] MAINT_035[@]
RELEASE_035[@] RELEASE_035[@]
MAINT_040[@]
RELEASE_040[@]
MAINT_041[@] MAINT_041[@]
RELEASE_041[@] RELEASE_041[@]
MAINT_042[@] MAINT_042[@]
RELEASE_042[@] RELEASE_042[@]
MAINT_043[@]
RELEASE_043[@]
MAINT_MASTER[@] MAINT_MASTER[@]
) )
COUNT=${#WORKTREE[@]} COUNT=${#WORKTREE[@]}

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

@ -172,18 +172,18 @@ DEFAULT_UPSTREAM_BRANCHES=
if [ "$DEFAULT_UPSTREAM_REMOTE" != "$UPSTREAM_REMOTE" ]; then if [ "$DEFAULT_UPSTREAM_REMOTE" != "$UPSTREAM_REMOTE" ]; then
DEFAULT_UPSTREAM_BRANCHES=$(echo \ DEFAULT_UPSTREAM_BRANCHES=$(echo \
"$DEFAULT_UPSTREAM_REMOTE"/master \ "$DEFAULT_UPSTREAM_REMOTE"/master \
"$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.3 \
"$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.2 \ "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.2 \
"$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.1 \ "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.1 \
"$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.4.0 \
"$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.3.5 \ "$DEFAULT_UPSTREAM_REMOTE"/{release,maint}-0.3.5 \
) )
fi fi
UPSTREAM_BRANCHES=$(echo \ UPSTREAM_BRANCHES=$(echo \
"$UPSTREAM_REMOTE"/master \ "$UPSTREAM_REMOTE"/master \
"$UPSTREAM_REMOTE"/{release,maint}-0.4.3 \
"$UPSTREAM_REMOTE"/{release,maint}-0.4.2 \ "$UPSTREAM_REMOTE"/{release,maint}-0.4.2 \
"$UPSTREAM_REMOTE"/{release,maint}-0.4.1 \ "$UPSTREAM_REMOTE"/{release,maint}-0.4.1 \
"$UPSTREAM_REMOTE"/{release,maint}-0.4.0 \
"$UPSTREAM_REMOTE"/{release,maint}-0.3.5 \ "$UPSTREAM_REMOTE"/{release,maint}-0.3.5 \
) )
@ -193,9 +193,9 @@ UPSTREAM_BRANCHES=$(echo \
PUSH_BRANCHES=$(echo \ PUSH_BRANCHES=$(echo \
master \ master \
{release,maint}-0.4.3 \
{release,maint}-0.4.2 \ {release,maint}-0.4.2 \
{release,maint}-0.4.1 \ {release,maint}-0.4.1 \
{release,maint}-0.4.0 \
{release,maint}-0.3.5 \ {release,maint}-0.3.5 \
) )
@ -206,9 +206,9 @@ if [ -z "$TEST_BRANCH_PREFIX" ]; then
# List of branches to push. Ordering is not important. # List of branches to push. Ordering is not important.
PUSH_BRANCHES=$(echo \ PUSH_BRANCHES=$(echo \
master \ master \
{release,maint}-0.4.3 \
{release,maint}-0.4.2 \ {release,maint}-0.4.2 \
{release,maint}-0.4.1 \ {release,maint}-0.4.1 \
{release,maint}-0.4.0 \
{release,maint}-0.3.5 \ {release,maint}-0.3.5 \
) )
else else
@ -218,9 +218,9 @@ else
# List of branches to push. Ordering is not important. # List of branches to push. Ordering is not important.
PUSH_BRANCHES=" \ PUSH_BRANCHES=" \
${TEST_BRANCH_PREFIX}_master \ ${TEST_BRANCH_PREFIX}_master \
${TEST_BRANCH_PREFIX}_043 \
${TEST_BRANCH_PREFIX}_042 \ ${TEST_BRANCH_PREFIX}_042 \
${TEST_BRANCH_PREFIX}_041 \ ${TEST_BRANCH_PREFIX}_041 \
${TEST_BRANCH_PREFIX}_040 \
${TEST_BRANCH_PREFIX}_035 \ ${TEST_BRANCH_PREFIX}_035 \
" "
fi fi

14
scripts/git/git-setup-dirs.sh
View File

@ -97,15 +97,15 @@ GITHUB_PUSH=${TOR_GITHUB_PUSH:-"No_Pushing_To_GitHub"}
# First set of arrays are the maint-* branch and then the release-* branch. # First set of arrays are the maint-* branch and then the release-* branch.
# New arrays need to be in the WORKTREE= array else they aren't considered. # New arrays need to be in the WORKTREE= array else they aren't considered.
MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" ) MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" )
MAINT_040=( "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" )
MAINT_041=( "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" ) MAINT_041=( "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" )
MAINT_042=( "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" ) MAINT_042=( "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" )
MAINT_043=( "maint-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.3" )
MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" ) MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" )
RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" ) RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" )
RELEASE_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" )
RELEASE_041=( "release-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" ) RELEASE_041=( "release-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" )
RELEASE_042=( "release-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.2" ) RELEASE_042=( "release-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.2" )
RELEASE_043=( "release-0.4.3" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.3" )
# The master branch path has to be the main repository thus contains the # The master branch path has to be the main repository thus contains the
# origin that will be used to fetch the updates. All the worktrees are created # origin that will be used to fetch the updates. All the worktrees are created
@ -115,14 +115,14 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME"
# SC2034 -- shellcheck thinks that these are unused. We know better. # SC2034 -- shellcheck thinks that these are unused. We know better.
ACTUALLY_THESE_ARE_USED=<<EOF ACTUALLY_THESE_ARE_USED=<<EOF
${MAINT_035[0]} ${MAINT_035[0]}
${MAINT_040[0]}
${MAINT_041[0]} ${MAINT_041[0]}
${MAINT_042[0]} ${MAINT_042[0]}
${MAINT_043[0]}
${MAINT_MASTER[0]} ${MAINT_MASTER[0]}
${RELEASE_035[0]} ${RELEASE_035[0]}
${RELEASE_040[0]}
${RELEASE_041[0]} ${RELEASE_041[0]}
${RELEASE_042[0]} ${RELEASE_042[0]}
${RELEASE_043[0]}
EOF EOF
####################### #######################
@ -165,15 +165,15 @@ WORKTREE=(
MAINT_035[@] MAINT_035[@]
RELEASE_035[@] RELEASE_035[@]
MAINT_040[@]
RELEASE_040[@]
MAINT_041[@] MAINT_041[@]
RELEASE_041[@] RELEASE_041[@]
MAINT_042[@] MAINT_042[@]
RELEASE_042[@] RELEASE_042[@]
MAINT_043[@]
RELEASE_043[@]
MAINT_MASTER[@] MAINT_MASTER[@]
) )