commit 9256b02cc8b2cc6ae495f9f2262b546429a89dbd Author: David Goulet dgoulet@torproject.org Date: Thu Feb 28 13:16:41 2019 -0500

maint: Remove 0.3.3 branch from git scripts

It is EOL today: Febuary 28th, 2019

No more releases will occur.

Closes #29616

Signed-off-by: David Goulet dgoulet@torproject.org --- scripts/maint/git-merge-forward.sh | 7 +------ scripts/maint/git-pull-all.sh | 5 ----- scripts/maint/git-push-all.sh | 1 - 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/scripts/maint/git-merge-forward.sh b/scripts/maint/git-merge-forward.sh index 3728067e7..e22e7befa 100755 --- a/scripts/maint/git-merge-forward.sh +++ b/scripts/maint/git-merge-forward.sh @@ -38,14 +38,12 @@ 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_033=( "maint-0.3.3" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.3" ) -MAINT_034=( "maint-0.3.4" "maint-0.3.3" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.4" ) +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_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" )

RELEASE_029=( "release-0.2.9" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" ) -RELEASE_033=( "release-0.3.3" "maint-0.3.3" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.3" ) 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" ) @@ -59,9 +57,6 @@ RELEASE_040=( "release-0.4.0" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4 WORKTREE=( RELEASE_029[@]

- MAINT_033[@] - RELEASE_033[@] - MAINT_034[@] RELEASE_034[@]

diff --git a/scripts/maint/git-pull-all.sh b/scripts/maint/git-pull-all.sh index e5c5d9467..e414ea28f 100755 --- a/scripts/maint/git-pull-all.sh +++ b/scripts/maint/git-pull-all.sh @@ -37,14 +37,12 @@ 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_033=( "maint-0.3.3" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.3" ) 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_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" )

RELEASE_029=( "release-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" ) -RELEASE_033=( "release-0.3.3" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.3" ) 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" ) @@ -59,9 +57,6 @@ WORKTREE=( MAINT_029[@] RELEASE_029[@]

- MAINT_033[@] - RELEASE_033[@] - MAINT_034[@] RELEASE_034[@]

diff --git a/scripts/maint/git-push-all.sh b/scripts/maint/git-push-all.sh index 0f4f5302a..0ce951d4b 100755 --- a/scripts/maint/git-push-all.sh +++ b/scripts/maint/git-push-all.sh @@ -8,5 +8,4 @@ git push $UPSTREAM_BRANCH \ {release,maint}-0.4.0 \ {release,maint}-0.3.5 \ {release,maint}-0.3.4 \ - {release,maint}-0.3.3 \ {release,maint}-0.2.9