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

Merge 4.1 to 5.0 #1401

Closed
mahalakshme opened this issue Sep 21, 2023 · 5 comments
Closed

Merge 4.1 to 5.0 #1401

mahalakshme opened this issue Sep 21, 2023 · 5 comments
Assignees

Comments

@mahalakshme
Copy link

mahalakshme commented Sep 21, 2023

client, server, webapp

Be mindful of merging models - and make sure the right version is in the package.json

@1t5j0y 1t5j0y self-assigned this Sep 21, 2023
1t5j0y added a commit to avniproject/avni-webapp that referenced this issue Sep 21, 2023
@mahalakshme
Copy link
Author

@1t5j0y check if 4.0 merged as well - I think it will be there since it would ve been merged to master - just make sure. but latest 4.0 changes to server need to be merged - the recent release done.

1t5j0y added a commit to avniproject/avni-webapp that referenced this issue Sep 21, 2023
1t5j0y added a commit to avniproject/avni-client that referenced this issue Sep 21, 2023
@1t5j0y
Copy link

1t5j0y commented Sep 21, 2023

server - verified latest 4.0 changes are present in 5.0
models - no merge required. Changed structured-clone to a dependency and pushed v1.30.69.
webapp - no merge required. upgraded models version to 1.30.69
client - merge commit - avniproject/avni-client@8976d68. Also upgraded models version to 1.30.69

@mahalakshme
Copy link
Author

@ashusvnath kindly check for avni-media and media-server.

@1t5j0y sorry forgot about rules-server - is the branching and merging done for that as well.

@ashusvnath
Copy link

Confirming that : 4.0 changes are present in main and 5.0 branches of avni-media and avni-etl repositories.

@1t5j0y
Copy link

1t5j0y commented Sep 22, 2023

rules-server - merged 4.0 into master and created new 5.0 from master

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

No branches or pull requests

4 participants