diff options
| author | David Goulet <dgoulet@torproject.org> | 2023-06-15 13:00:11 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2023-06-19 08:09:39 -0400 |
| commit | 94f4d0968b57db8b3346a5b51b9e0c2ed3e8d98f (patch) | |
| tree | 239535ee6180c02db819dbef996fe60b0f4b786f /scripts | |
| parent | 623a55764b8c72e6271f822c1fe68b9613c551b9 (diff) | |
| download | tor-94f4d0968b57db8b3346a5b51b9e0c2ed3e8d98f.tar.gz tor-94f4d0968b57db8b3346a5b51b9e0c2ed3e8d98f.zip | |
Change git.tpo URLs to gitlab.tpo
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/git/git-push-all.sh | 2 | ||||
| -rwxr-xr-x | scripts/git/git-setup-dirs.sh | 21 |
2 files changed, 3 insertions, 20 deletions
diff --git a/scripts/git/git-push-all.sh b/scripts/git/git-push-all.sh index e5c16e615f..0eac616000 100755 --- a/scripts/git/git-push-all.sh +++ b/scripts/git/git-push-all.sh @@ -80,7 +80,7 @@ if [ "$TOR_FULL_GIT_PATH" ]; then fi # git push command and default arguments GIT_PUSH=${TOR_GIT_PUSH:-"git push --atomic"} -# The upstream remote which git.torproject.org/tor.git points to. +# The upstream remote which gitlab.torproject.org/tpo/core/tor.git points to. DEFAULT_UPSTREAM_REMOTE=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} # Push to a different upstream remote using -r <remote-name> UPSTREAM_REMOTE=${DEFAULT_UPSTREAM_REMOTE} diff --git a/scripts/git/git-setup-dirs.sh b/scripts/git/git-setup-dirs.sh index c502f74f58..f8a85c4928 100755 --- a/scripts/git/git-setup-dirs.sh +++ b/scripts/git/git-setup-dirs.sh @@ -40,10 +40,6 @@ function usage() echo " (current: $GITHUB_PULL)" echo " TOR_GITHUB_PUSH: the tor-github remote push URL" echo " (current: $GITHUB_PUSH)" - echo " TOR_GITLAB_PULL: the tor-gitlab remote pull URL" - echo " (current: $GITLAB_PULL)" - echo " TOR_GITLAB_PUSH: the tor-gitlab remote push URL" - echo " (current: $GITLAB_PUSH)" echo " TOR_EXTRA_CLONE_ARGS: extra arguments to git clone" echo " (current: $TOR_EXTRA_CLONE_ARGS)" echo " TOR_EXTRA_REMOTE_NAME: the name of an extra remote" @@ -72,9 +68,9 @@ TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"} TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"} # Origin repositories -GIT_ORIGIN_PULL=${TOR_GIT_ORIGIN_PULL:-"https://git.torproject.org/tor.git"} +GIT_ORIGIN_PULL=${TOR_GIT_ORIGIN_PULL:-"https://gitlab.torproject.org/tpo/core/tor.git"} GIT_ORIGIN_PUSH=${TOR_GIT_ORIGIN_PUSH:-"git@git-rw.torproject.org:tor.git"} -# The upstream remote which git.torproject.org/tor.git points to. +# The upstream remote which gitlab.torproject.org/tpo/core/tor.git points to. DEFAULT_UPSTREAM_REMOTE=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"} # Copy the URLs from origin GIT_UPSTREAM_PULL="$GIT_ORIGIN_PULL" @@ -87,10 +83,6 @@ fi GITHUB_PULL=${TOR_GITHUB_PULL:-"https://github.com/torproject/tor.git"} GITHUB_PUSH=${TOR_GITHUB_PUSH:-"No_Pushing_To_GitHub"} -# GitLab repositories -GITLAB_PULL=${TOR_GITLAB_PULL:-"https://gitlab.torproject.org/tpo/core/tor.git"} -GITLAB_PUSH=${TOR_GITLAB_PUSH:-"No_Pushing_To_GitLab"} - ########################## # Git branches to manage # ########################## @@ -493,15 +485,6 @@ set_tor_github_pr_fetch_config # Now fetch them all fetch_remote "tor-github" -# GitLab remote -printf "%s Setting up remote %s\\n" "$MARKER" "${BYEL}tor-gitlab${CNRM}" -add_remote "tor-gitlab" "$GITLAB_PULL" -set_remote_push "tor-gitlab" "$GITLAB_PUSH" -# Add custom fetch for MRs -set_tor_gitlab_mr_fetch_config -# Now fetch them all -fetch_remote "tor-gitlab" - # Extra remote if [ "$TOR_EXTRA_REMOTE_NAME" ]; then printf "%s Setting up remote %s\\n" "$MARKER" \ |