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

Move master branch to main branch #2452

Merged
merged 1 commit into from
Apr 30, 2021
Merged

Move master branch to main branch #2452

merged 1 commit into from
Apr 30, 2021

Conversation

ineiti
Copy link
Member

@ineiti ineiti commented Apr 28, 2021

There are some Master references in the code, specifically in the evoting section, that I don't know if it's correct to replace them... @gnarula , any idea?

@ineiti ineiti self-assigned this Apr 28, 2021
@ineiti ineiti added this to WIP in Cothority via automation Apr 28, 2021
@ineiti ineiti moved this from WIP to Ready4Merge in Cothority Apr 28, 2021
@ineiti ineiti requested a review from gnarula April 28, 2021 08:58
@sonarcloud
Copy link

sonarcloud bot commented Apr 28, 2021

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@gnarula
Copy link
Contributor

gnarula commented Apr 28, 2021

I believe references to Master are for the skipchain that tracks all the other election skipchains. s/Master/Main and s/master/main shouldn't be okay. Is it fine if I add a commit to this branch?

@ineiti
Copy link
Member Author

ineiti commented Apr 29, 2021

Is it fine if I add a commit to this branch?

Yes, of course. I was not sure whether I'd break anything, so I left it as-is. But if we're replacing the branch-name master, it makes also sense to replace the variable names called master...

@ineiti ineiti requested a review from tharvik April 30, 2021 06:48
@gnarula
Copy link
Contributor

gnarula commented Apr 30, 2021

Digging into this, I see we'd require changes in dedis/epfl-evoting recreating the proto file in that repo.

I think we're too close to actual elections to be making changes and suggesting VPSI to use it for this cycle. Having said that I do have to make a release with #2451 though.

I don't want to block you on this PR so I'd suggest going ahead with the current changes. I can work on the evoting related changes in a separate PR in the next sprint (so sometime between the 10th-21st) if that's okay?

@ineiti
Copy link
Member Author

ineiti commented Apr 30, 2021

I don't want to block you on this PR so I'd suggest going ahead with the current changes.

I thought of simply accepting that you still use Master for the evoting, but to move all the rest to main. Once you're ready to change the evoting code from master to main, this can be included later.

Added #2454

On an unrelated note: former master of India, prince Philipp, just died, might be a good occasion to move to main now ;)

@ineiti ineiti merged commit 0299bcd into master Apr 30, 2021
Cothority automation moved this from Ready4Merge to Closed Apr 30, 2021
@ineiti ineiti deleted the main branch April 30, 2021 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Cothority
  
Closed
Development

Successfully merging this pull request may close these issues.

None yet

3 participants