[tor/master] Update git scripts for new versions - tor-commits

11 Jun 2019

commit 46da530431d340cde22192d9df475d85b5d9fab7
Author: Nick Mathewson nickm@torproject.org
Date:   Mon Jun 10 08:54:22 2019 -0400
Update git scripts for new versions
{maint,release}-0.4.1 are now real
{maint,release}-0.3.4 are now EOL
Closes ticket 30822
---
 scripts/git/git-merge-forward.sh | 18 +++++++++---------
 scripts/git/git-pull-all.sh      | 14 +++++++-------
 scripts/git/git-push-all.sh      |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
index 67af7e98b..98ad07c9c 100755
--- a/scripts/git/git-merge-forward.sh
+++ b/scripts/git/git-merge-forward.sh
@@ -38,15 +38,15 @@ TOR_WKT_NAME="tor-wkt"
 #
 # 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.
-MAINT_034=( "maint-0.3.4" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.4" )
-MAINT_035=( "maint-0.3.5" "maint-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" )
+MAINT_035=( "maint-0.3.5" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" )
 MAINT_040=( "maint-0.4.0" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" )
-MAINT_MASTER=( "master" "maint-0.4.0" "$GIT_PATH/$TOR_MASTER_NAME" )
+MAINT_041=( "maint-0.4.1" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" )
+MAINT_MASTER=( "master" "maint-0.4.1" "$GIT_PATH/$TOR_MASTER_NAME" )
RELEASE_029=( "release-0.2.9" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" )
-RELEASE_034=( "release-0.3.4" "maint-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.4" )
 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" )
# 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
@@ -55,14 +55,14 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME"
# SC2034 -- shellcheck thinks that these are unused.  We know better.
 ACTUALLY_THESE_ARE_USED=<<EOF
-${MAINT_034[0]}
 ${MAINT_035[0]}
 ${MAINT_040[0]}
+${MAINT_041[0]}
 ${MAINT_MASTER[0]}
 ${RELEASE_029[0]}
-${RELEASE_034[0]}
 ${RELEASE_035[0]}
 ${RELEASE_040[0]}
+${RELEASE_041[0]}
 EOF
##########################
@@ -74,15 +74,15 @@ EOF
 WORKTREE=(
   RELEASE_029[@]
-  MAINT_034[@]
-  RELEASE_034[@]
-
   MAINT_035[@]
   RELEASE_035[@]
MAINT_040[@]
   RELEASE_040[@]
+  MAINT_041[@]
+  RELEASE_041[@]
+
   MAINT_MASTER[@]
 )
 COUNT=${#WORKTREE[@]}
diff --git a/scripts/git/git-pull-all.sh b/scripts/git/git-pull-all.sh
index 5d1d58e4b..ec8511d27 100755
--- a/scripts/git/git-pull-all.sh
+++ b/scripts/git/git-pull-all.sh
@@ -37,15 +37,15 @@ TOR_WKT_NAME="tor-wkt"
 # 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.
 MAINT_029=( "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.2.9" )
-MAINT_034=( "maint-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.4" )
 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_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" )
RELEASE_029=( "release-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" )
-RELEASE_034=( "release-0.3.4" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.4" )
 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" )
# 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
@@ -55,14 +55,14 @@ ORIGIN_PATH="$GIT_PATH/$TOR_MASTER_NAME"
 # SC2034 -- shellcheck thinks that these are unused.  We know better.
 ACTUALLY_THESE_ARE_USED=<<EOF
 ${MAINT_029[0]}
-${MAINT_034[0]}
 ${MAINT_035[0]}
 ${MAINT_040[0]}
+${MAINT_041[0]}
 ${MAINT_MASTER[0]}
 ${RELEASE_029[0]}
-${RELEASE_034[0]}
 ${RELEASE_035[0]}
 ${RELEASE_040[0]}
+${RELEASE_041[0]}
 EOF
##########################
@@ -75,15 +75,15 @@ WORKTREE=(
   MAINT_029[@]
   RELEASE_029[@]
-  MAINT_034[@]
-  RELEASE_034[@]
-
   MAINT_035[@]
   RELEASE_035[@]
MAINT_040[@]
   RELEASE_040[@]
+  MAINT_041[@]
+  RELEASE_041[@]
+
   MAINT_MASTER[@]
 )
 COUNT=${#WORKTREE[@]}
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh
index 0ce951d4b..9e1b39c10 100755
--- a/scripts/git/git-push-all.sh
+++ b/scripts/git/git-push-all.sh
@@ -5,7 +5,7 @@ UPSTREAM_BRANCH="upstream"
git push $UPSTREAM_BRANCH \
    master \
+   {release,maint}-0.4.1 \
    {release,maint}-0.4.0 \
    {release,maint}-0.3.5 \
-   {release,maint}-0.3.4 \
    {release,maint}-0.2.9

    