Skip to content
This repository has been archived by the owner on Feb 20, 2023. It is now read-only.

Rename master branch to main #11427

Closed
9 of 12 tasks
ekager opened this issue Jun 10, 2020 · 5 comments
Closed
9 of 12 tasks

Rename master branch to main #11427

ekager opened this issue Jun 10, 2020 · 5 comments
Assignees
@st3fan
Labels
eng:automation Build automation, Continuous integration, .. eng:build Build system, gradle, configuration eng:documentation Documentation for our team processes eng:release Release Engineering eng:task An engineering breakout issue of a user story
Projects
Fenix Sprint Kanban Mobile CI/Build Automation Android Engineering Team Kanban board

Comments

@ekager
Copy link
Contributor

ekager commented Jun 10, 2020 •
edited by data-sync-user

Notifying teams:

  • Send an email to internal teams
  • Leave a note on forks that we know of

Changes that need to land:

Manual steps:

Verification:

  • TreeHerder is Good
  • Make sure Nightly builds work
  • Make sure we pick up string changes
  • Make sure we pick up new A-C builds
  • Make sure Pull Requests build/test on TaskCluster
  • Make sure merges to main build succesfully
  • Make sure the performance tooling works

┆Issue is synchronized with this Jira Task
@github-actions github-actions bot added the needs:triage Issue needs triage label Jun 10, 2020
@ekager ekager removed the needs:triage Issue needs triage label Jun 10, 2020
@eliserichards eliserichards added eng:automation Build automation, Continuous integration, .. eng:build Build system, gradle, configuration eng:documentation Documentation for our team processes eng:task An engineering breakout issue of a user story labels Jun 10, 2020
ekager added a commit to ekager/fenix that referenced this issue Jun 10, 2020
@ekager
For mozilla-mobile#11427 - Updates documentation for new main branch
a1629a7
@ekager ekager added the eng:release Release Engineering label Jun 10, 2020
@ekager
Copy link
Contributor Author

ekager commented Jun 11, 2020 •
edited

The "master" reference on git can be traced back etymologically to a master/slave reference https://mail.gnome.org/archives/desktop-devel-list/2019-May/msg00066.html

We will also be making sure we stop using "blacklist/whitelist". Words matter.

@bookshelfdave bookshelfdave mentioned this issue Jun 11, 2020
Open
@JohanLorenzo
Copy link
Contributor

JohanLorenzo commented Jun 16, 2020 •
edited

The "master" reference on git can be traced back etymologically to a master/slave reference https://mail.gnome.org/archives/desktop-devel-list/2019-May/msg00066.html

TIL!

There is some work needed for Releng, but I don't think this has a high complexity. Here's what has to be done:

  • The hook in charge of watching to .cron.yml has to watch another branch than master. This can be done by making this logic smarter.
  • Then we have to handle what we call "action tasks". These are the tasks that enable reruns and retriggers, for instance. As of now, we monitor the master branch. We need to make this piece smarter too.
  • Then, we need to rename master-specific scopes to refer to main instead. That said, that shouldn't be necessary once bug 1631839 is done. I sent an email out about a month ago and sent a reminder earlier today. If I don't hear any concerns, I'll handle it by the end of this month.

Apart from that, I don't see anything else. One quick note: I only looked into Fenix, there may be some differences if we want to make the change on other mobile projects. @tomprince, do you see anything I might have missed?

@vesta0 vesta0 added this to Sprint in Fenix Sprint Kanban Jun 30, 2020
@data-sync-user data-sync-user changed the title Rename master branch to main FNX3-14630 ⁃ Rename master branch to main Aug 10, 2020
@data-sync-user data-sync-user changed the title FNX3-14630 ⁃ Rename master branch to main FNX-12361 ⁃ Rename master branch to main Aug 11, 2020
@data-sync-user data-sync-user changed the title FNX-12361 ⁃ Rename master branch to main FNX2-13462 ⁃ Rename master branch to main Aug 11, 2020
@kbrosnan kbrosnan changed the title FNX2-13462 ⁃ Rename master branch to main Rename master branch to main Aug 29, 2020
@st3fan st3fan added this to Backlog (Untriaged) in Mobile CI/Build Automation Feb 8, 2021
@stale
Copy link

stale bot commented Feb 25, 2021

See: #17373 This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the wontfix label Feb 25, 2021
@stale stale bot closed this as completed Mar 4, 2021
Fenix Sprint Kanban automation moved this from Sprint to Sprint 20.11 Done Mar 4, 2021
@pocmo pocmo reopened this Mar 25, 2021
Fenix Sprint Kanban automation moved this from Sprint 20.11 Done to In Progress Mar 25, 2021
@stale stale bot removed the wontfix label Mar 25, 2021
@pocmo pocmo mentioned this issue Mar 25, 2021
Merged
@pocmo pocmo mentioned this issue Apr 21, 2021
Closed
@st3fan st3fan self-assigned this Apr 22, 2021
@st3fan st3fan mentioned this issue Apr 22, 2021
Closed
15 tasks
@pocmo
Copy link
Contributor

pocmo commented Apr 30, 2021

From the Focus renaming: We also need to make changes in the android-l10n(-tooling) repos to import/export strings from/to main

@jhugman
Copy link
Contributor

jhugman commented Jun 22, 2021

This issue is one year old. Is there any progress we can report publicly? @st3fan @pocmo @mhoye

@gabrielluong gabrielluong added this to Ready for Engineering (min-5 ; max-22) in Android Engineering Team Kanban board via automation Jun 22, 2021
@gabrielluong gabrielluong moved this from Ready for Engineering (min-5 ; max-22) to In Development (WIP limit - 15) in Android Engineering Team Kanban board Jun 22, 2021
@st3fan st3fan mentioned this issue Jul 20, 2021
Closed
st3fan added a commit that referenced this issue Jul 21, 2021
@st3fan
Fixes #11427 - Rename master branch to main (Automation/TC)
7cbac46
st3fan added a commit that referenced this issue Jul 21, 2021
@st3fan
Fixes #11427 - Rename master branch to main (GitHub Workflows)
de0e3ee
st3fan added a commit that referenced this issue Jul 21, 2021
@st3fan
Fixes #11427 - Rename master branch to main (GitHub Workflows)
55aca12
st3fan added a commit that referenced this issue Jul 21, 2021
@st3fan
Fixes #11427 - Rename master branch to main (GitHub Issue Templates)
5e3957d
st3fan added a commit that referenced this issue Jul 21, 2021
@st3fan
Fixes #11427 - Rename master branch to main (Jenkins)
62c7c32
st3fan added a commit that referenced this issue Jul 21, 2021
@st3fan
Fixes #11427 - Rename master branch to main (README & Documentation)
da44fa4
st3fan added a commit that referenced this issue Jul 21, 2021
@st3fan
Fixes #11427 - Rename master branch to main (Jenkins)
758d0e0
st3fan added a commit that referenced this issue Jul 21, 2021
@st3fan
Fixes #11427 - Rename master branch to main (Random)
0679cdb
@st3fan st3fan mentioned this issue Jul 27, 2021
Merged
@st3fan st3fan closed this as completed in 6a3adb5 Jul 28, 2021
Fenix Sprint Kanban automation moved this from In Progress to Sprint 20.11 Done Jul 28, 2021
Android Engineering Team Kanban board automation moved this from In Development (WIP limit - 15) to Done Jul 28, 2021
czlucius pushed a commit to czlucius/fenix that referenced this issue Aug 20, 2021
@st3fan @czlucius
Fixes mozilla-mobile#11427 - Rename master branch to main (mozilla-mo…
66bd40e 
…bile#20457)

* Fixes mozilla-mobile#11427 - Rename master branch to main (Automation/TC)

* Fixes mozilla-mobile#11427 - Rename master branch to main (GitHub Workflows)

* Fixes mozilla-mobile#11427 - Rename master branch to main (GitHub Workflows)

* Fixes mozilla-mobile#11427 - Rename master branch to main (GitHub Issue Templates)

* Fixes mozilla-mobile#11427 - Rename master branch to main (Jenkins)

* Fixes mozilla-mobile#11427 - Rename master branch to main (README & Documentation)

* Fixes mozilla-mobile#11427 - Rename master branch to main (Jenkins)

* Fixes mozilla-mobile#11427 - Rename master branch to main (Random)
czlucius pushed a commit to czlucius/fenix that referenced this issue Aug 22, 2021
@st3fan @czlucius
Fixes mozilla-mobile#11427 - Rename master branch to main (mozilla-mo…
23f7a64 
…bile#20457)

* Fixes mozilla-mobile#11427 - Rename master branch to main (Automation/TC)

* Fixes mozilla-mobile#11427 - Rename master branch to main (GitHub Workflows)

* Fixes mozilla-mobile#11427 - Rename master branch to main (GitHub Workflows)

* Fixes mozilla-mobile#11427 - Rename master branch to main (GitHub Issue Templates)

* Fixes mozilla-mobile#11427 - Rename master branch to main (Jenkins)

* Fixes mozilla-mobile#11427 - Rename master branch to main (README & Documentation)

* Fixes mozilla-mobile#11427 - Rename master branch to main (Jenkins)

* Fixes mozilla-mobile#11427 - Rename master branch to main (Random)
This was referenced Sep 29, 2021
Closed
Closed
@rpappalax rpappalax moved this from Backlog (Untriaged) to Done in Mobile CI/Build Automation Nov 15, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees

@st3fan st3fan

Labels
eng:automation Build automation, Continuous integration, .. eng:build Build system, gradle, configuration eng:documentation Documentation for our team processes eng:release Release Engineering eng:task An engineering breakout issue of a user story
Projects
Fenix Sprint Kanban
  
Sprint 20.11 Done
Mobile CI/Build Automation
Done
Android Engineering Team Kanban board
Done
Milestone
No milestone
Development

No branches or pull requests
7 participants
@st3fan @pocmo @jhugman @JohanLorenzo @ekager @eliserichards and others