Skip to content

Migrate the flutter/flutter repository to use main as the primary development branch/channel #95041

Closed as not planned

Description

@christopherfujino

This is an umbrella tracking issue.

Activity

  1. added
    toolAffects the "flutter" command-line tool. See also t: labels.
    P3Issues that are less important to the Flutter project
    on Dec 10, 2021
  2. Hixie commented on Dec 11, 2021

    @Hixie
    Contributor
  3. mit-mit commented on Aug 30, 2022

    @mit-mit
    Member

    @godofredoc @Hixie currently master is part of our public "API" in the flutter tool in the channel command. Would it make sense to start by introducing master as an "alias" for main in flutter channel so that both flutter channel main and flutter channel master would be valid commands for getting primary development channel? That would allow folks to start to use the proper "main" channel verbiage immediately, and would later make it a non-breaking change to update the underlying git branch name.

  4. christopherfujino commented on Aug 30, 2022

    @christopherfujino
    ContributorAuthor

    @godofredoc @Hixie currently master is part of our public "API" in the flutter tool in the channel command. Would it make sense to start by introducing master as an "alias" for main in flutter channel so that both flutter channel main and flutter channel master would be valid commands for getting primary development channel? That would allow folks to start to use the proper "main" channel verbiage immediately, and would later make it a non-breaking change to update the underlying git branch name.

    This makes sense. Then we can have a migration phase where we, for example, update documentation.

  5. added
    P2Important issues not at the top of the work list
    and removed
    P3Issues that are less important to the Flutter project
    on Aug 30, 2022
  6. godofredoc commented on Aug 30, 2022

    @godofredoc
    Contributor

    We are already mirroring master to main adding the alias may be straightforward. @christopherfujino can you please point to the place where we can make the change?

  7. christopherfujino commented on Aug 30, 2022

    @christopherfujino
    ContributorAuthor

    We are already mirroring master to main adding the alias may be straightforward. @christopherfujino can you please point to the place where we can make the change?

    This is the source for the flutter channel command: https://github.com/flutter/flutter/blob/master/packages/flutter_tools/lib/src/commands/channel.dart

    It looks like that command does one of two things (depending on whether or not there is a trailing argument): list available channels (with the _listChannels() method) or change the current channel (with the _switchChannel() method).

    It looks like _listChannels() depends on https://github.com/flutter/flutter/blob/master/packages/flutter_tools/lib/src/version.dart#L42 kOfficialChannels, which then depends on https://github.com/flutter/flutter/blob/master/packages/flutter_tools/lib/src/globals.dart#L280 kDefaultFrameworkChannel

  8. Hixie commented on Sep 6, 2022

    @Hixie
    Contributor

    Making main an alias for master SGTM.

  9. mit-mit commented on Nov 14, 2022

    @mit-mit
    Member

    @godofredoc can we assign this to you wrt. the branch aliasing?

  10. self-assigned this
    on Nov 15, 2022
  11. 1 remaining item

  12. gspencergoog commented on Feb 23, 2023

    @gspencergoog
    Contributor

    In #115388 Godofredo added an alias for master called main, and the two branches are always in sync (the have all the same commits, with all the same hashes, etc). Users can use the two branches interchangeably in git operations (pull, fetch, etc.), and they can switch to the "main" channel instead of the "master" channel with flutter channel. We still have master-api.flutter.dev as a site, but not main-api.flutter.dev for the API docs on that channel.

    AFAIK, We do still use master in some of the CI scripts, but @godofredoc and @christopherfujino know more about progress there than I do.

  13. mit-mit commented on Feb 24, 2023

    @mit-mit
    Member

    Cool, I think we can go ahead with changing the website then? https://github.com/flutter/website/pull/7856/files

    @timsneath you asked that we waited until after Flutter Forward; is now OK?

  14. added
    team-toolOwned by Flutter Tool team
    triaged-toolTriaged by Flutter Tool team
    and removed
    triaged-toolTriaged by Flutter Tool team
    on Jul 8, 2023
  15. flutter-triage-bot commented on Jul 14, 2023

    @flutter-triage-bot

    This issue is assigned to @godofredoc but has had no recent status updates. Please consider unassigning this issue if it is not going to be addressed in the near future. This allows people to have a clearer picture of what work is actually planned. Thanks!

  16. added
    ⏳Bot is counting down the days until it unassigns the issue
    on Jul 30, 2023
  17. flutter-triage-bot commented on Sep 22, 2023

    @flutter-triage-bot

    This issue was assigned to @godofredoc but has had no status updates in a long time. To remove any ambiguity about whether the issue is being worked on, the assignee was removed.

  18. removed
    ⏳Bot is counting down the days until it unassigns the issue
    on Sep 22, 2023
  19. guidezpl commented on Apr 10, 2024

    @guidezpl
    Member

    This seems to be a duplicate, closing this issue in favor of the more detailed #121564

  20. added
    r: duplicateIssue is closed as a duplicate of an existing issue
    on Apr 10, 2024
  21. github-actions commented on Apr 24, 2024

    @github-actions

    This thread has been automatically locked since there has not been any recent activity after it was closed. If you are still experiencing a similar issue, please open a new bug, including the output of flutter doctor -v and a minimal reproduction of the issue.

  22. locked as resolved and limited conversation to collaborators on Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    P2Important issues not at the top of the work listr: duplicateIssue is closed as a duplicate of an existing issueteam-toolOwned by Flutter Tool teamtoolAffects the "flutter" command-line tool. See also t: labels.

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions