- tbb-commits - lists.torproject.org

[builders/tor-browser-build] branch maint-11.5 updated: Bug 40583: Fix build of goansicolor
by gitolite role 19 Jul '22

19 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch maint-11.5 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 8cf2973 Bug 40583: Fix build of goansicolor 8cf2973 is described below commit 8cf297318dce9e2c71a2aca162036c00fa70d49a Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon Jul 18 09:24:11 2022 +0200 Bug 40583: Fix build of goansicolor Fixup for #40547. --- projects/goansicolor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/goansicolor/config b/projects/goansicolor/config index 68b1032..b3188d6 100644 --- a/projects/goansicolor/config +++ b/projects/goansicolor/config @@ -4,7 +4,7 @@ git_url: https://github.com/shiena/ansicolor.git git_hash: a422bbe96644373c5753384a59d678f7d261ff10 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: -use_container: 1 + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.11.0esr-12.0-1 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 19 Jul '22

19 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-91.11.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.11.0esr-12.0-1 by this push: new 1ea93eaa5400c fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection 1ea93eaa5400c is described below commit 1ea93eaa5400cc4af793235539b2c863a4194aca Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Jul 18 16:29:49 2022 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41059: Bridges are not shown in locales that have only the language code --- browser/components/torpreferences/content/connectionPane.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js index 644b13dc9cb8e..6162ca37e8faf 100644 --- a/browser/components/torpreferences/content/connectionPane.js +++ b/browser/components/torpreferences/content/connectionPane.js @@ -731,7 +731,7 @@ const gConnectionPane = (function() { const annotations = await res.json(); const bcp47 = Services.locale.appLocaleAsBCP47; const dash = bcp47.indexOf("-"); - const lang = dash !== -1 ? bcp47.substr(dash) : lang; + const lang = dash !== -1 ? bcp47.substr(dash) : bcp47; if (bcp47 in annotations) { emojiAnnotations = annotations[bcp47]; } else if (lang in annotations) { -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated (af27913 -> 0ce5e1d)
by gitolite role 19 Jul '22

19 Jul '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch master in repository builders/tor-browser-build. from af27913 Bug 41052: Updated the manual to pipeline 44679 add 0ce5e1d Bug 40583: Fix build of goansicolor No new revisions were added by this update. Summary of changes: projects/goansicolor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40583: Fix build of goansicolor
by gitolite role 19 Jul '22

19 Jul '22

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 0ce5e1d Bug 40583: Fix build of goansicolor 0ce5e1d is described below commit 0ce5e1d0f06bc879f714760ecee8d9d0b9bbe434 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon Jul 18 09:24:11 2022 +0200 Bug 40583: Fix build of goansicolor Fixup for #40547. --- projects/goansicolor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/goansicolor/config b/projects/goansicolor/config index 68b1032..b3188d6 100644 --- a/projects/goansicolor/config +++ b/projects/goansicolor/config @@ -4,7 +4,7 @@ git_url: https://github.com/shiena/ansicolor.git git_hash: a422bbe96644373c5753384a59d678f7d261ff10 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: -use_container: 1 + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.5 updated (54ec362 -> 0563692)
by gitolite role 18 Jul '22

18 Jul '22

1 2

[builders/tor-browser-build] branch master updated (2a6dd31 -> af27913)
by gitolite role 18 Jul '22

18 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch master in repository builders/tor-browser-build. from 2a6dd31 Bug 40581: Some master branches are renamed to main add af27913 Bug 41052: Updated the manual to pipeline 44679 No new revisions were added by this update. Summary of changes: doc/how-to-update-the-manual.txt | 3 ++- projects/manual/config | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 41052: Updated the manual to pipeline 44679
by gitolite role 18 Jul '22

18 Jul '22

This is an automated email from the git hooks/post-receive script. boklm 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 af27913 Bug 41052: Updated the manual to pipeline 44679 af27913 is described below commit af27913bbe55404e2136aca7f756c10433624bc9 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Jul 18 12:04:11 2022 +0200 Bug 41052: Updated the manual to pipeline 44679 --- doc/how-to-update-the-manual.txt | 3 ++- projects/manual/config | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/how-to-update-the-manual.txt b/doc/how-to-update-the-manual.txt index 334701c..0afd0db 100644 --- a/doc/how-to-update-the-manual.txt +++ b/doc/how-to-update-the-manual.txt @@ -5,4 +5,5 @@ 5. Upload it to people.tpo 6. Update projects/manual/config 6.1 Change the version to $PIPELINEID - 6.2 Update the URL if it was different from the previous uploader + 6.2 Update the hash in the input_files section + 6.3 Update the URL if it was different from the previous uploader diff --git a/projects/manual/config b/projects/manual/config index 890bfab..909e565 100644 --- a/projects/manual/config +++ b/projects/manual/config @@ -1,6 +1,7 @@ # vim: filetype=yaml sw=2 # To update, see doc/how-to-update-the-manual.txt -version: 40628 +# Remember to update also the package's hash, with the version! +version: 44679 filename: 'manual-[% c("version") %].tar.gz' container: use_container: 1 @@ -18,6 +19,6 @@ input_files: - project: container-image - URL: 'https://people.torproject.org/~pierov/tbb_files/manual_[% c("version") %].zip' name: manual - sha256sum: 64bab7e8b26014277b55cf2afc4f676f3a164f466fc33e72aa62004318994c3a + sha256sum: d9061ca5afdf4d04fb735bc645318d5eedc69f10fa200faaca82731ad4b105f7 - filename: packagemanual.py name: package_script -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated (d853ed9 -> 2a6dd31)
by gitolite role 15 Jul '22

15 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch master in repository builders/tor-browser-build. from d853ed9 Bug 23656: Use mozconfig files from tor-browser.git to build firefox add 2a6dd31 Bug 40581: Some master branches are renamed to main No new revisions were added by this update. Summary of changes: .gitlab/issue_templates/Release Prep.md | 4 ++-- doc/HACKING.txt | 2 +- doc/MAKEFILE.txt | 2 +- projects/tor-launcher/config | 2 +- rbm.local.conf.example | 4 ++-- tools/changelog-format-blog-post | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40581: Some master branches are renamed to main
by gitolite role 15 Jul '22

15 Jul '22

This is an automated email from the git hooks/post-receive script. boklm 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 2a6dd31 Bug 40581: Some master branches are renamed to main 2a6dd31 is described below commit 2a6dd31208e5a1b4ebc0bebc0e48e702c84da03e Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Fri Jul 15 12:55:15 2022 +0200 Bug 40581: Some master branches are renamed to main --- .gitlab/issue_templates/Release Prep.md | 4 ++-- doc/HACKING.txt | 2 +- doc/MAKEFILE.txt | 2 +- projects/tor-launcher/config | 2 +- rbm.local.conf.example | 4 ++-- tools/changelog-format-blog-post | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab/issue_templates/Release Prep.md b/.gitlab/issue_templates/Release Prep.md index d5e596a..d2d0207 100644 --- a/.gitlab/issue_templates/Release Prep.md +++ b/.gitlab/issue_templates/Release Prep.md @@ -58,7 +58,7 @@ - [ ] Sign/Tag commit : - Tag : `$(TOR_LAUNCHER_VERSION)` - Message `Tagging $(TOR_LAUNCHER_VERSION)` -- [ ] Push `master` and tag to origin +- [ ] Push `main` and tag to origin ### tor-browser: https://git.torproject.org/tor-browser.git - [ ] ***(Optional)*** Rebase to `$(ESR_VERSION)` @@ -174,7 +174,7 @@ <summary>Build/Signing/Publishing</summary> ### tor-browser-build: https://git.torproject.org/builders/tor-browser-build.git -Tor Browser Alpha (and Nightly) are on the `master` branch, while Stable lives in the various `$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-maint` (and possibly more specific) branches +Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in the various `$(TOR_BROWSER_MAJOR).$(TOR_BROWSER_MINOR)-maint` (and possibly more specific) branches - [ ] Update `rbm.conf` - [ ] `var/torbrowser_version` : update to next version diff --git a/doc/HACKING.txt b/doc/HACKING.txt index d6dd6d1..1c4e638 100644 --- a/doc/HACKING.txt +++ b/doc/HACKING.txt @@ -363,7 +363,7 @@ introduced by the testbuild target is the output directory. By default the testbuild is based on the alpha build. All the options can have a different definition for the alpha, release and nightly builds. Usually the git_hash option has a different definition for the nightly -builds in order to point to the master branch. +builds in order to point to the main branch. If you want your testbuild target to create builds based on nightly rather than alpha, you can edit your rbm.local.conf file and uncomment diff --git a/doc/MAKEFILE.txt b/doc/MAKEFILE.txt index fe24abf..d577a17 100644 --- a/doc/MAKEFILE.txt +++ b/doc/MAKEFILE.txt @@ -29,7 +29,7 @@ Same as torbrowser-alpha, for the selected platform only. torbrowser-nightly ------------------ Build Tor Browser for the nightly channel, for all supported platforms. -Many of the components will be based on the master branch. You might +Many of the components will be based on the main branch. You might want to run "make fetch" before, to fetch the latest commits from all components. diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index f1dac65..809c524 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -20,5 +20,5 @@ steps: targets: nightly: version: '[% c("abbrev") %]' - git_hash: master + git_hash: main tag_gpg_id: 0 diff --git a/rbm.local.conf.example b/rbm.local.conf.example index c4aa163..a735e4c 100644 --- a/rbm.local.conf.example +++ b/rbm.local.conf.example @@ -69,10 +69,10 @@ var: # - torbrowser-all # ### If you are doing 'release' builds in the maint-7.0 branch and - ### 'alpha' builds in the master branch, you can use the following + ### 'alpha' builds in the main branch, you can use the following ### configuration: #clean: - # master: + # main: # - project: release # target: # - alpha diff --git a/tools/changelog-format-blog-post b/tools/changelog-format-blog-post index a50ae8f..b34093e 100755 --- a/tools/changelog-format-blog-post +++ b/tools/changelog-format-blog-post @@ -44,7 +44,7 @@ foreach (<CHANGELOG>) { $changelog .= $_; } -my $changelog_branch = 'master'; +my $changelog_branch = 'main'; if (! ( $current_tbversion =~ m/a/ ) ) { my @v = split(/\./, $current_tbversion); $changelog_branch = "maint-$v[0].$v[1]"; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-bundle-testsuite] branch main updated (6933288 -> c3f662b)
by gitolite role 15 Jul '22

15 Jul '22

This is an automated email from the git hooks/post-receive script. boklm pushed a change to branch main in repository tor-browser-bundle-testsuite. from 6933288 Bug 40045: Run static-update-component in rsync-to-tbb-nightlies-master add bdc6f73 Bug 40061: Update tor-browser-build targets after tor-browser-build#40501 add ffecc79 Bug 40062: Use tor-browser-build.git main branch add c3f662b Bug 40062: Update tools/pull to follow main No new revisions were added by this update. Summary of changes: TBBTestSuite/TestSuite/TorBrowserBuild.pm | 29 +++++++++++++++++++---------- tools/pull | 12 ++++++------ 2 files changed, 25 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0