This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch main in repository builders/tor-browser-build.

The following commit(s) were added to refs/heads/main by this push: new 545c246 Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos 545c246 is described below

commit 545c246436143ae6d09c7068259e18716cf25779 Author: Richard Pospesel richard@torproject.org AuthorDate: Wed Sep 21 23:20:16 2022 +0000

Bug 40587: Migrate tor-browser-build configs from gitolite to gitlab repos

We need to wait until goptlib is migrated, and we will need to update the snowflake build script as its sources hardcode the gitolite repo --- projects/firefox/config | 2 +- projects/geckoview/config | 2 +- projects/snowflake/build | 1 + projects/snowflake/config | 2 +- projects/tba-translation/config | 2 +- projects/tor-android-service/config | 2 +- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/translation-base-browser/config | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config index 0e0f66b..29ac382 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -3,7 +3,7 @@ version: '[% c("abbrev") %]' filename: 'firefox-[% c("var/project-name") %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build[% c("var/browser_build") %]' tag_gpg_id: 1 -git_url: https://git.torproject.org/tor-browser.git +git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg container: diff --git a/projects/geckoview/config b/projects/geckoview/config index a7c9d13..4b86bc4 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -3,7 +3,7 @@ version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_hash: 'geckoview-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 -git_url: https://git.torproject.org/tor-browser.git +git_url: https://gitlab.torproject.org/tpo/applications/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg container: diff --git a/projects/snowflake/build b/projects/snowflake/build index a7eae3f..6907a06 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -22,6 +22,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %]

+# snowflake sources hard-code these paths mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git/v2" # Fix gopath location of versioned dependencies diff --git a/projects/snowflake/config b/projects/snowflake/config index 2a0cf3c..3e93d3d 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://git.torproject.org/pluggable-transports/snowflake.git +git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowf... git_hash: 01ae5b56e8399d29aa18605dc9add913d84dc553 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'

diff --git a/projects/tba-translation/config b/projects/tba-translation/config index a8b655b..40b0a96 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://git.torproject.org/translation.git +git_url: https://gitlab.torproject.org/tpo/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. git_hash: 460e8b8f4ad42cb383fec11250b2a5a2250d86fd diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 0cbe245..5197f22 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' git_hash: 0f264c8891904b63057c46a4e3902cc73b6b860c -git_url: https://git.torproject.org/tor-android-service.git +git_url: https://gitlab.torproject.org/tpo/applications/tor-android-service.git git_submodule: 1 container: use_container: 1 diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 0f66861..0b2b0b4 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: 0.2.39 -git_url: https://git.torproject.org/tor-launcher.git +git_url: https://gitlab.torproject.org/tpo/applications/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg tag_gpg_id: 1 diff --git a/projects/tor/config b/projects/tor/config index b8aa19b..4425d48 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -2,7 +2,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' version: 0.4.7.10 git_hash: 'tor-[% c("version") %]' -git_url: https://git.torproject.org/tor.git +git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 gpg_keyring: tor.gpg tag_gpg_id: 1 diff --git a/projects/translation-base-browser/config b/projects/translation-base-browser/config index 06ca6e0..749c788 100644 --- a/projects/translation-base-browser/config +++ b/projects/translation-base-browser/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://git.torproject.org/translation.git +git_url: https://gitlab.torproject.org/tpo/translation.git git_hash: 7ca5011f45f7839b74bb10e855b4bfad46e46df8 version: '[% c("abbrev") %]'