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 next major spec with master #289

Merged
merged 25 commits into from
Dec 12, 2022
Merged

feat: update next major spec with master #289

merged 25 commits into from
Dec 12, 2022

Conversation

jonaslagoni
Copy link
Member

Description
This PR updates the next_major_spec branch with master commits

char0n and others added 17 commits September 29, 2022 09:01
@char0n @smoya
@asyncapi-bot @asyncapi-bot-eve @whitlockjc @derberg
feat: release for version 2.5.0 of the spec (asyncapi#265)
652c200 
Co-authored-by: Sergio Moya <[email protected]>
Co-authored-by: asyncapi-bot <[email protected]>
Co-authored-by: asyncapi-bot-eve <[email protected]>
Co-authored-by: Jeremy Whitlock <[email protected]>
Co-authored-by: derberg <[email protected]>
@asyncapi-bot
chore(release): v3.2.0 (asyncapi#268)
6dbc2b1
@smoya
fix: add AsyncAPI v2.5.0 schema to the all.schema-store.json doc. (as…
b2bbe09 
…yncapi#269)
@asyncapi-bot
chore(release): v3.2.1 (asyncapi#270)
ac8b697
@fmvilas
chore: add Sergio and Vladimir as code owners (asyncapi#271)
0f51bb9
@asyncapi-bot
ci: update generic workflows (asyncapi#274)
52b13da
@asyncapi-bot
ci: update generic workflows (asyncapi#276)
0c4b0b3
@dependabot
chore(deps): bump dot-prop and conventional-changelog-angular (asynca…
ba0f516 
…pi#277)
@magicmatatjahu @smoya
feat!: remove unsupported specs from NodeJS export (asyncapi#248)
f55917d 
Co-authored-by: Sergio Moya <[email protected]>
@asyncapi-bot
chore(release): v4.0.0 (asyncapi#278)
dd5966c
@asyncapi-bot
ci: update generic workflows (asyncapi#279)
7e249d7
@mastdev
refactor: update schema to resolve reference property issue (asyncapi…
5f7edd3 
…#275)
@asyncapi-bot
ci: update generic workflows (asyncapi#281)
daa885c
@dependabot
chore(deps): bump @actions/core from 1.6.0 to 1.9.1 in /.github/workf…
77c40b5 
…lows/scripts/mailchimp (asyncapi#282)
@asyncapi-bot
ci: update generic workflows (asyncapi#285)
b2c64eb
@codingtenshi
ci: remove not needed workflow (asyncapi#286)
14ecce9
@jonaslagoni
Merge branch 'master-github-upstream' into feature/update_next_major_…
c3e7118 
…spec_with_master

# Conflicts:
#	index.js
#	package-lock.json
#	package.json
@jonaslagoni
Copy link
Member Author

Important that you merge this PR as merge commit and not a squash commit, this means you have to change some settings in the repo most likely!

Otherwise, the merge conflicts will come back to haunt us later on 😄

cc codeowners @fmvilas @whitlockjc @derberg @dalelane @smoya

@jonaslagoni jonaslagoni mentioned this pull request Nov 21, 2022
Closed
@fmvilas
Copy link
Member

fmvilas commented Nov 21, 2022

Shouldn't this PR point to next-major-spec branch? 🤔

@jonaslagoni jonaslagoni changed the base branch from master to next-major-spec November 21, 2022 23:22
@jonaslagoni
Copy link
Member Author

Of course @fmvilas 🤦 Changing.

fmvilas
fmvilas previously approved these changes Nov 21, 2022
View reviewed changes
Copy link
Member

@fmvilas fmvilas left a comment

Choose a reason for hiding this comment

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

I'm happy to merge manually with a merge commit. Let's wait for the others to see what they have to say.

dalelane
dalelane previously approved these changes Dec 1, 2022
View reviewed changes
derberg
derberg previously approved these changes Dec 5, 2022
View reviewed changes
@jonaslagoni jonaslagoni dismissed stale reviews from derberg, dalelane, and fmvilas via a10f733 December 9, 2022 17:59
@jonaslagoni
Copy link
Member Author

Updated with the latest master changes.

@jonaslagoni jonaslagoni requested review from fmvilas and removed request for char0n and smoya December 9, 2022 18:01
@sonarqubecloud
Copy link

sonarqubecloud bot commented Dec 9, 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
No Duplication information No Duplication information

@jonaslagoni jonaslagoni mentioned this pull request Dec 9, 2022
Merged
@fmvilas
Copy link
Member

fmvilas commented Dec 9, 2022

@dalelane @derberg please approve again 🙏

@fmvilas fmvilas merged commit d4d5197 into asyncapi:next-major-spec Dec 12, 2022
@fmvilas
Copy link
Member

fmvilas commented Dec 12, 2022

Alright, merged with merge commit @jonaslagoni

@asyncapi-bot
Copy link
Contributor

🎉 This PR is included in version 4.1.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

@asyncapi-bot
Copy link
Contributor

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

The release is available on:

Your semantic-release bot 📦🚀

@jonaslagoni jonaslagoni deleted the feature/update_next_major_spec_with_master branch February 7, 2023 10:05
@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

@derberg derberg derberg approved these changes

@dalelane dalelane dalelane approved these changes

@fmvilas fmvilas fmvilas approved these changes

@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.