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.

Sign up for GitHub

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

Jump to bottom

feat: update with master #361

Merged
merged 7 commits into from
Mar 17, 2023
Merged

feat: update with master #361

merged 7 commits into from
Mar 17, 2023

Conversation

jonaslagoni
Copy link
Member

Description
This PR updates next-major-spec with master.

@sonarqubecloud
Copy link

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
No Duplication information No Duplication information

@jonaslagoni
Copy link
Member Author

Remember to merge this as regular commit.

smoya
smoya requested changes Mar 17, 2023
View reviewed changes
Copy link
Member

@smoya smoya left a comment

Choose a reason for hiding this comment

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

Note: This should be merged with "Rebase and merge", otherwise the commits will be lost.

Google Chrome_CvLgckjf@2x

@derberg how should we proceed since that method is disabled?

I mark this as "Request changes" to block the merge.

@asyncapi asyncapi deleted a comment from asyncapi-bot Mar 17, 2023
@smoya
Copy link
Member

smoya commented Mar 17, 2023

I think the best still is keeping a PR always opened from next-major to master and tell @asyncapi-bot to keep it up-to-date.
Right @derberg ?

@jonaslagoni
Copy link
Member Author

jonaslagoni commented Mar 17, 2023 •
edited
Loading

@derberg how should we proceed since that method is disabled?

@smoya you will have to change the settings of the branch and then change it back 🙂

I think the best still is keeping a PR always opened from next-major to master and tell @asyncapi-bot to keep it up-to-date.

Its not possible because of conflicts in package version. Have to happen manually.

It only works if the branch is not doing it's own deployment and version change.

@smoya
Copy link
Member

smoya commented Mar 17, 2023

@smoya you will have to change the settings of the branch and then change it back 🙂

I thought that wasnt allowed to me. But it is. So proceeding.
However, better to find a long term solution, if any. Will create an issue later to discuss about this.

Its not possible because of conflicts in package version. Have to happen manually.

Yeah, right. The never ending story.

@smoya
Copy link
Member

smoya commented Mar 17, 2023

@jonaslagoni Screenshot_20230317-132601.png

I dont fully get why squash and merge works but Rebase doesnt. Do you believe there are conflicts? Can you rebase and push?

@jonaslagoni
Copy link
Member Author

I have always used merge commit, so not sure what the deal is with rebase and merge.

@smoya smoya merged commit a3d843b into asyncapi:next-major-spec Mar 17, 2023
@asyncapi-bot
Copy link
Contributor

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

The release is available on:

Your semantic-release bot 📦🚀

@asyncapi-bot
Copy link
Contributor

🎉 This PR is included in version 4.2.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@asyncapi-bot
Copy link
Contributor

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

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
Reviewers

@smoya smoya smoya approved these changes

@fmvilas fmvilas Awaiting requested review from fmvilas fmvilas is a code owner

@derberg derberg Awaiting requested review from derberg derberg is a code owner

@dalelane dalelane Awaiting requested review from dalelane dalelane is a code owner

@char0n char0n Awaiting requested review from char0n char0n is a code owner

@asyncapi-bot-eve asyncapi-bot-eve Awaiting requested review from asyncapi-bot-eve asyncapi-bot-eve is a code owner

Assignees
No one assigned
Labels
released on @next-major-spec released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jonaslagoni @smoya @asyncapi-bot @AceTheCreator