Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename default branch from master to main #324

Open
AlejandroFernandezLuces opened this issue Jan 7, 2025 · 4 comments
Open

Rename default branch from master to main #324

AlejandroFernandezLuces opened this issue Jan 7, 2025 · 4 comments

Comments

@AlejandroFernandezLuces
Copy link
Contributor

AlejandroFernandezLuces commented Jan 7, 2025

As title says.

Suggested in https://github.com/ansys-internal/pymechanical-meshworkflows/pull/51#discussion_r1905519900

This change is easy, but surely will break stuff in third repos. Maybe a migration plan should be defined?

@RobPasMue
Copy link
Member

Definitely needs a migration plan. I think what was suggested works:

  • Having master and main as two separate branches. Make main the default and sync back master during the migration period.
  • Leave it as is for several months and work with the various libraries using this to adapt
  • After migration on libraries is complete, completely deprecate master and freeze it.
  • Eventually, deletion of master. I'm worried about backwards compatibility here for libraries that have already released versions using it... so this point is TBDetermined.

@SMoraisAnsys
Copy link
Contributor

@AlejandroFernandezLuces I may have missed that info but can we start moving to main now ? :) I just checked and it seems that main is getting synchronized with master so I was wondering if we could start the migration.

@AlejandroFernandezLuces
Copy link
Contributor Author

Right now the main branch is the default one, we are syncronizing master with main just for retrocompatibility reasons. Have you had any issues with the repo? Maybe I've done something wrong.

This is the syncing logic we have in place:

- name: Sync master with main
run: |
git checkout master
git pull origin master
git merge origin/main --no-edit
git push origin master

@SMoraisAnsys
Copy link
Contributor

Right now the main branch is the default one, we are syncronizing master with main just for retrocompatibility reasons. Have you had any issues with the repo? Maybe I've done something wrong.

This is the syncing logic we have in place:

example-data/.github/workflows/sync-master.yml

Lines 25 to 30 in cd76c27

   - name: Sync master with main 
     run: | 
       git checkout master 
       git pull origin master 
       git merge origin/main --no-edit 
       git push origin master

No issues at all. I just wanted to know if we should wait a bit more because there were some tests going on or if we could do the changes. I'll apply that in pyaedt then :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants