Commit ee195d53 authored by morgan's avatar morgan 😸 Committed by Pier Angelo Vendrame
Browse files

fixup! BB 43615: Add Gitlab Issue and Merge Request templates 

update branch creation section now that we have tags from the firefox repo
parent e0877d78

.gitlab/issue_templates/060 Rebase - Alpha.md

+2 −11
Original line number Diff line number Diff line
@@ -45,17 +45,8 @@ 


### **Create New Branches**



- [ ] Find the Firefox mercurial tag `$(ESR_TAG)`

  - If `$(BROWSER_MINOR)` is 5, the tag should already exist from the stable release

  - Otherwise:

    - [ ] Go to `https://hg.mozilla.org/releases/mozilla-esr$(ESR_MAJOR)/tags`

    - [ ] Find and inspect the commit tagged with `$(ESR_TAG)`

      - Tags are in yellow in the Mercurial web UI

    - [ ] Find the equivalent commit in `https://github.com/mozilla/gecko-dev/commits/esr$(ESR_MAJOR)`

      - The tag should be very close to `HEAD` (usually the second, before a `No bug - Tagging $(HG_HASH) with $(ESR_TAG)`)

      - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/esr$(ESR_MAJOR)` locally, instead

    - [ ] Sign/Tag the `gecko-dev` commit: `git tag -as $(ESR_TAG) $(GIT_HASH) -m "Hg tag $(ESR_TAG)"`

- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag

- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG}

- [ ] Create new alpha `base-browser` branch from Firefox ${ESR_TAG}

  - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`

  - **Example**: `base-browser-102.8.0esr-12.5-1`

- [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag

.gitlab/issue_templates/061 Rebase - Stable.md

+1 −9
Original line number Diff line number Diff line
@@ -42,15 +42,7 @@ 


### **Identify the Firefox Tagged Commit and Create New Branches**



- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags

   - **Example**: `FIREFOX_102_8_0esr_BUILD1`

- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev

  - **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

  - **Example**: `3a3a96c9eedd02296d6652dd50314fccbc5c4845`

- [ ] Sign and Tag `gecko-dev` commit

  - Sign/Tag `gecko-dev` commit :

    - **Tag**: `$(ESR_TAG)`

    - **Message**: `Hg tag $(ESR_TAG)`

- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG}

- [ ] Create new stable `base-browser` branch from tag

  - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1`

  - **Example**: `base-browser-102.8.0esr-12.0-1`

.gitlab/issue_templates/063 Rebase - Rapid.md

+2 −9
Original line number Diff line number Diff line
@@ -138,15 +138,8 @@ gitGraph: 


### **Create New Branches**



- [ ] Find the Firefox mercurial tag `$(NIGHTLY_TAG)`

  - Go to https://hg.mozilla.org/mozilla-central/tags

  - Find and inspect the commit tagged with `$(NIGHTLY_TAG)`

    - Tags are in yellow in the Mercurial web UI

  - Find the equivalent commit in https://github.com/mozilla/gecko-dev/commits/master

    - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/master` locally, instead

    - Using the differential revision link is useful to quickly find the git commit

  - Sign/Tag the `gecko-dev` commit: `git tag -as $(NIGHTLY_TAG) $(GIT_HASH) -m "Hg tag $(NIGHTLY_TAG)"`

- [ ] Create two new rapid `tor-browser` branches from Firefox mercurial tag

- [ ] Fetch Mozilla's firefox repo and identify this release's ${NIGHTLY_TAG}

- [ ] Create two new rapid `tor-browser` branches from Firefox ${NIGHTLY_TAG}

  - Branch name in the form: `tor-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-${BRANCH_NUM}`

  - **Example**: `tor-browser-130.0a1-15.0-1` and `tor-browser-130.0a1-15.0-2`

- [ ] Push new `tor-browser` branches and the `firefox` tag to `upstream`