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

chore: update next-spec branch with master changes #606

Merged

Conversation

char0n
Copy link
Contributor

@char0n char0n commented Sep 13, 2022

This is PR is part of asyncapi/spec#830 and updates next-spec branch with changes from master.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome to AsyncAPI. Thanks a lot for creating your first pull request. Please check out our contributors guide useful for opening a pull request.
Keep in mind there are also other channels you can use to interact with AsyncAPI community. For more details check out this issue.

@char0n char0n mentioned this pull request Sep 13, 2022
61 tasks
@char0n
Copy link
Contributor Author

char0n commented Sep 13, 2022

@fmvilas @derberg @jonaslagoni @magicmatatjahu can you please look into this PR. It's part of 2.5.0 release effort and updates the release branch (next-spec) with master branch.

Copy link
Member

@derberg derberg left a comment

Choose a reason for hiding this comment

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

strange to see changes only in package-lock.json

GH is not able to load diff for me, what is in there?

@char0n
Copy link
Contributor Author

char0n commented Sep 14, 2022

@derberg there was conflict in package-lock.json file between master and next-spec. I did try to resolve using git diff tool but I've always ended up with corrupted package-lock.json. So I've decided to regenerate it using node v16.15.1 (npm v8.11.0) and following command:

  $ npm i --verbose --legacy-peer-deps

@derberg
Copy link
Member

derberg commented Sep 14, 2022

@char0n weird, there should not be any conflicts, we should just take 1:1 what is in the master as I don't think there should be any changes in the next-spec related to dependencies

@char0n char0n force-pushed the char0n/next-spec-update-from-master branch from 6f2f015 to 384ad21 Compare September 14, 2022 12:58
@sonarcloud
Copy link

sonarcloud bot commented Sep 14, 2022

Kudos, SonarCloud Quality Gate passed!    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

@char0n
Copy link
Contributor Author

char0n commented Sep 14, 2022

@char0n weird, there should not be any conflicts, we should just take 1:1 what is in the master as I don't think there should be any changes in the next-spec related to dependencies

@derberg you can try for yourself by checking into next-spec branch and running git merge master. Just make sure both branches are up-todate.

Anyway, I've tried to eliminate the package-lock.json diff by copying it's content from master during conflict resolution and running npm i to regenerate only actual changes from package.json instead of regenerating it all. You are now able to inspect the diff in package-lock.json file.

@char0n
Copy link
Contributor Author

char0n commented Sep 14, 2022

And the windows memory test is now passing as well.

Copy link
Member

@derberg derberg left a comment

Choose a reason for hiding this comment

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

LGTM 👍🏼

@derberg
Copy link
Member

derberg commented Sep 15, 2022

/rtm

@asyncapi-bot asyncapi-bot merged commit a7a5423 into asyncapi:next-spec Sep 15, 2022
@asyncapi-bot
Copy link
Contributor

🎉 This PR is included in version 1.17.0-next-spec.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@asyncapi-bot
Copy link
Contributor

🎉 This PR is included in version 1.17.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@asyncapi-bot
Copy link
Contributor

🎉 This PR is included in version 2.0.0-next-major.18 🎉

The release is available on:

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

6 participants