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@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]";