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

Follow DEDIS/master updates #59

Merged
merged 2 commits into from
Nov 22, 2023
Merged

Follow DEDIS/master updates #59

merged 2 commits into from
Nov 22, 2023

Conversation

ineiti
Copy link
Member

@ineiti ineiti commented Nov 21, 2023

This commit updates the code to work with the latest updates from the DEDIS/master branch. Now when we have new commits, we can also open PRs against the DEDIS/master upstream.

The first commit is not worth looking into, it's a perl -pi -e followed by goimports -w ..
Just look at the second commit.

Closes #57

Thank you for opening a pull request with this project, please also:

@ineiti ineiti self-assigned this Nov 21, 2023
@ineiti ineiti changed the base branch from back_to_dedis to main November 21, 2023 16:09
@ineiti ineiti mentioned this pull request Nov 21, 2023
5 tasks
This PR moves all the imports and module name back to go.dedis.ch/dela.
Then a 'replace' directive in the go.mod will point to our fork.
This commit updates the code to work with the latest updates from the DEDIS/master branch.
Now when we have new commits, we can also open PRs against the DEDIS/master upstream.
@ineiti ineiti force-pushed the follow_dedis_updates branch from ab84b5b to a7ea54f Compare November 21, 2023 16:17
@ineiti ineiti marked this pull request as ready for review November 21, 2023 16:20
Copy link
Member

@PascalinDe PascalinDe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ineiti ineiti merged commit 345415c into main Nov 22, 2023
12 checks passed
@ineiti ineiti deleted the follow_dedis_updates branch November 22, 2023 06:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Catch up with dedis/dela
2 participants