Unverified Commit 2a6dd312 authored by boklm's avatar boklm
Browse files

Bug 40581: Some master branches are renamed to main

parent d853ed93

.gitlab/issue_templates/Release Prep.md

+2 −2
Original line number Diff line number Diff line
@@ -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

doc/HACKING.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

doc/MAKEFILE.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.

projects/tor-launcher/config

+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@ steps: 
targets:

  nightly:

    version: '[% c("abbrev") %]'

    git_hash: master

    git_hash: main

    tag_gpg_id: 0

rbm.local.conf.example

+2 −2
Original line number Diff line number Diff line
@@ -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