diff --git a/projects/firefox/config b/projects/firefox/config index 0e0f66bdbd7f539168d7fd56293d9a96b0cc6d66..29ac3821e130c8d5d15bcb3ae99e5fcd78ada64d 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 a7c9d13dedd8c6e234a007f3a03433f54d56fcd6..4b86bc41c904048161c653df45e7fed999e01108 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 a7eae3feda706f070b838aec9fe593a57aa38922..6907a06bcd9701c63d3a92b23b5dce8f0620023a 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 2a0cf3c1a20c4aebbedd499a68d5b388ee795432..3e93d3db84ff953e01b3f977a4ca6c9fe0a70dfc 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/snowflake.git 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 a8b655bfcb72cd749a6dda4f451207c1be6af9f9..40b0a96750cc6d5ef41dd995e98c24ccf2ab8b34 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 0cbe24517383b2621a59ba9b56d5e98f5d5bd1f8..5197f22ec5b12283be30c3db692a985a25edd890 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 0f66861f9720259f2d2aa407034ef44c186d238c..0b2b0b46771a528a63b03658cceafd5431f5bfab 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 b8aa19bf248287db96d83f8d9e05e4a04fd9bc98..4425d488f68dfa0292fee531daed22eeb4e576f8 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 06ca6e015eaada876ab4330cbf4b77da7fdd54df..749c788151d1ce095f8b72a75cbc88c45f173f68 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") %]'