morgan pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

4 changed files:

Changes:

  • .gitlab/issue_templates/060 Rebase - Alpha.md
    ... ... @@ -45,17 +45,8 @@
    45 45
     
    
    46 46
     ### **Create New Branches**
    
    47 47
     
    
    48
    -- [ ] Find the Firefox mercurial tag `$(ESR_TAG)`
    
    49
    -  - If `$(BROWSER_MINOR)` is 5, the tag should already exist from the stable release
    
    50
    -  - Otherwise:
    
    51
    -    - [ ] Go to `https://hg.mozilla.org/releases/mozilla-esr$(ESR_MAJOR)/tags`
    
    52
    -    - [ ] Find and inspect the commit tagged with `$(ESR_TAG)`
    
    53
    -      - Tags are in yellow in the Mercurial web UI
    
    54
    -    - [ ] Find the equivalent commit in `https://github.com/mozilla/gecko-dev/commits/esr$(ESR_MAJOR)`
    
    55
    -      - The tag should be very close to `HEAD` (usually the second, before a `No bug - Tagging $(HG_HASH) with $(ESR_TAG)`)
    
    56
    -      - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/esr$(ESR_MAJOR)` locally, instead
    
    57
    -    - [ ] Sign/Tag the `gecko-dev` commit: `git tag -as $(ESR_TAG) $(GIT_HASH) -m "Hg tag $(ESR_TAG)"`
    
    58
    -- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag
    
    48
    +- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG}
    
    49
    +- [ ] Create new alpha `base-browser` branch from Firefox ${ESR_TAG}
    
    59 50
       - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
    
    60 51
       - **Example**: `base-browser-102.8.0esr-12.5-1`
    
    61 52
     - [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag
    
    ... ... @@ -160,4 +151,4 @@
    160 151
     
    
    161 152
     /label ~"Apps::Product::TorBrowser"
    
    162 153
     /label ~"Apps::Type::Rebase"
    
    163
    -/label ~"Apps::Priority::Blocker"
    154
    +/label ~"Priority::Blocker"

  • .gitlab/issue_templates/061 Rebase - Stable.md
    ... ... @@ -42,15 +42,7 @@
    42 42
     
    
    43 43
     ### **Identify the Firefox Tagged Commit and Create New Branches**
    
    44 44
     
    
    45
    -- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags
    
    46
    -   - **Example**: `FIREFOX_102_8_0esr_BUILD1`
    
    47
    -- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev
    
    48
    -  - **Tip**: Search for unique string (like the Differential Revision ID) found in the mercurial commit in the `gecko-dev/esr102` branch to find the equivalent commit
    
    49
    -  - **Example**: `3a3a96c9eedd02296d6652dd50314fccbc5c4845`
    
    50
    -- [ ] Sign and Tag `gecko-dev` commit
    
    51
    -  - Sign/Tag `gecko-dev` commit :
    
    52
    -    - **Tag**: `$(ESR_TAG)`
    
    53
    -    - **Message**: `Hg tag $(ESR_TAG)`
    
    45
    +- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG}
    
    54 46
     - [ ] Create new stable `base-browser` branch from tag
    
    55 47
       - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`
    
    56 48
       - **Example**: `base-browser-102.8.0esr-12.0-1`
    
    ... ... @@ -122,4 +114,4 @@
    122 114
     
    
    123 115
     /label ~"Apps::Product::TorBrowser"
    
    124 116
     /label ~"Apps::Type::Rebase"
    
    125
    -/label ~"Apps::Priority::Blocker"
    117
    +/label ~"Priority::Blocker"

  • .gitlab/issue_templates/063 Rebase - Rapid.md
    ... ... @@ -138,15 +138,8 @@ gitGraph:
    138 138
     
    
    139 139
     ### **Create New Branches**
    
    140 140
     
    
    141
    -- [ ] Find the Firefox mercurial tag `$(NIGHTLY_TAG)`
    
    142
    -  - Go to https://hg.mozilla.org/mozilla-central/tags
    
    143
    -  - Find and inspect the commit tagged with `$(NIGHTLY_TAG)`
    
    144
    -    - Tags are in yellow in the Mercurial web UI
    
    145
    -  - Find the equivalent commit in https://github.com/mozilla/gecko-dev/commits/master
    
    146
    -    - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/master` locally, instead
    
    147
    -    - Using the differential revision link is useful to quickly find the git commit
    
    148
    -  - Sign/Tag the `gecko-dev` commit: `git tag -as $(NIGHTLY_TAG) $(GIT_HASH) -m "Hg tag $(NIGHTLY_TAG)"`
    
    149
    -- [ ] Create two new rapid `tor-browser` branches from Firefox mercurial tag
    
    141
    +- [ ] Fetch Mozilla's firefox repo and identify this release's ${NIGHTLY_TAG}
    
    142
    +- [ ] Create two new rapid `tor-browser` branches from Firefox ${NIGHTLY_TAG}
    
    150 143
       - Branch name in the form: `tor-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-${BRANCH_NUM}`
    
    151 144
       - **Example**: `tor-browser-130.0a1-15.0-1` and `tor-browser-130.0a1-15.0-2`
    
    152 145
     - [ ] Push new `tor-browser` branches and the `firefox` tag to `upstream`
    
    ... ... @@ -297,4 +290,4 @@ gitGraph:
    297 290
     
    
    298 291
     /label ~"Apps::Product::TorBrowser"
    
    299 292
     /label ~"Apps::Type::Rebase"
    
    300
    -/label ~"Apps::Priority::High"
    293
    +/label ~"Priority::High"

  • .gitlab/issue_templates/090 Emergency Security Issue.md
    ... ... @@ -101,5 +101,5 @@ Godspeed! :pray:
    101 101
     /label ~"Apps::Product::TorBrowser"
    
    102 102
     /label ~"Apps::Product::MullvadBrowser"
    
    103 103
     /label ~"Apps::Type::Bug"
    
    104
    -/label ~"Apps::Priority::Blocker"
    
    104
    +/label ~"Priority::Blocker"
    
    105 105
     /label ~"Emergency"