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

Repository branch reorganisation #1001

Open
k-wolski opened this issue Aug 26, 2024 · 5 comments
Open

Repository branch reorganisation #1001

k-wolski opened this issue Aug 26, 2024 · 5 comments
Assignees

Comments

@k-wolski
Copy link

k-wolski commented Aug 26, 2024

Context

After merging 2.0-new-repository-structure to 2.0, we have slightly more stable situation on viadot repository.

After migration to prefect v2 everywhere (Velux/Lapp), we should consider another change:

  • branch main should become 1.0 - only for archive purpose
  • branch 2.0 should become main - I'm not writing "merged", as I don't think it should be done that way, main and 2.0 are totally separate projects and shouldn't be mixed

It's topic to be discussed once migration topics will be done - probably in October 2024.

Impact

  • some CI/CD workflows probably need to be updated
  • branch protection rules/rulesets
  • users - just communication, or any actions on their side?
  • update references to main/2.0 in docs (make branch explicit wherever possible)
@trymzet
Copy link
Contributor

trymzet commented Aug 26, 2024

@k-wolski I think what you mean reg point 2) is that it should become the default branch

@dyvenia dyvenia deleted a comment Aug 26, 2024
@k-wolski
Copy link
Author

@k-wolski I think what you mean reg point 2) is that it should become the default branch

With this approach main can stay as default branch all the time, or we can change approach here and get rid of main in favour of 1.0/2.0 and 3.0 in the future. It's open topic for me.

@trymzet
Copy link
Contributor

trymzet commented Aug 26, 2024

For me it's either

  1. change 2.0 to be the default branch or
  2. raname main to 1.0 and 2.0 to main (main remains the default branch, but it will be what is now the 2.0 branch 😄)

@marcinpurtak

@marcinpurtak
Copy link
Collaborator

marcinpurtak commented Aug 27, 2024

For me it's either

  1. change 2.0 to be the default branch or
  2. raname main to 1.0 and 2.0 to main (main remains the default branch, but it will be what is now the 2.0 branch 😄)

@marcinpurtak

For me the approach with viadot = branch 1.0 , viadot2 = branch 2.0 is more readible. Plus I would put 2.0 as default branch once the migration is done.

@trymzet
Copy link
Contributor

trymzet commented Aug 27, 2024

Yeah seems like fewer changes are needed and we can also treat this as step 1 of a 2-stage process.

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

4 participants
@trymzet @marcinpurtak @k-wolski and others