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

chore: merge master into next major spec #787

Merged
merged 89 commits into from
Jun 13, 2023
Merged

chore: merge master into next major spec #787

merged 89 commits into from
Jun 13, 2023

Conversation

fmvilas
Copy link
Member

@fmvilas fmvilas commented Jun 13, 2023

I'm merging the master branch into next-major-spec and fixing all the conflicts 😅

smoya and others added 30 commits April 27, 2022 16:43
@smoya
feat: release for version 2.4.0 of the spec (asyncapi#501)
2898c4d
@asyncapi-bot
chore(release): v1.15.0 (asyncapi#537)
378d8cd
@KhudaDad414
docs: fix links in Markdown files (asyncapi#540)
ede66d0
@asyncapi-bot
chore: update generated docs (asyncapi#541)
b382043
@smoya
ci(release): use new branch naming strategy (asyncapi#546)
6d5563e
@asyncapi-bot
ci: update generic workflows (asyncapi#549)
169e081
@asyncapi-bot
ci: update global contribution guide (asyncapi#550)
ff3085e
@asyncapi-bot
chore: update code of conduct (asyncapi#555)
429c8e7
@Tenischev
fix: case when message is oneOf for one element (asyncapi#554)
48d8708
@asyncapi-bot
chore(release): v1.15.1 (asyncapi#557)
afb7f17
@derberg
refactor: remove bundle.js from repository (asyncapi#556)
1464ba8
@asyncapi-bot
ci: update generic workflows (asyncapi#559)
85312f2
@dependabot
chore(deps): bump semver-regex from 3.1.3 to 3.1.4 (asyncapi#560)
0348674
@dependabot
chore(deps-dev): bump semantic-release from 17.4.3 to 19.0.3 (asyncap…
2e3d5de 
…i#562)
@dependabot
chore(deps): bump minimist from 1.2.5 to 1.2.6 (asyncapi#563)
c8b5c37
@asyncapi-bot
ci: update workflows for nodejs projects (asyncapi#568)
a8b1f8a
@dependabot
chore(deps): bump shell-quote from 1.7.2 to 1.7.3 (asyncapi#567)
fc94a00
@asyncapi-bot
ci: update generic workflows (asyncapi#569)
c962a7e
@asyncapi-bot
ci: update generic workflows (asyncapi#574)
58d0505
@jonaslagoni
fix: upgrade @asyncapi/specs (asyncapi#423)
a8d6283
@asyncapi-bot
chore(release): v1.15.2 (asyncapi#608)
c6c6c77
@aeworxet
feat: parseFromUrl does not resolve relative references (asyncapi#572)
d7ea01a
@asyncapi-bot
chore(release): v1.16.0 (asyncapi#609)
7a297f4
@tinatinz
docs: add node.js and npm to README.md (asyncapi#584)
2a924e5
@allcontributors
chore: add aeworxet as a contributor (asyncapi#613)
0246fc8
@asyncapi-bot
ci: update generic workflows (asyncapi#616)
40622fc
@asyncapi-bot
ci: update generic workflows (asyncapi#621)
0277ce7
@asyncapi-bot
ci: update workflows for nodejs projects (asyncapi#624)
88247df 
Co-authored-by: asyncapi-bot <info@asyncapi.io>
@asyncapi-bot
ci: update generic workflows (asyncapi#625)
77be400
@asyncapi-bot
ci: update generic workflows (asyncapi#628)
6aba2c7 
Co-authored-by: asyncapi-bot <info@asyncapi.io>
@fmvilas
Copy link
Member Author

fmvilas commented Jun 13, 2023

Can someone guess why npm test is failing? It complains that cross-env is not installed but it's on the package.json file. And it's running well on my machine 🤔

@smoya
Copy link
Member

smoya commented Jun 13, 2023

Can someone guess why npm test is failing? It complains that cross-env is not installed but it's on the package.json file. And it's running well on my machine 🤔

For some reason, we are not catching errors on npm install step. There are some in this case https://github.com/asyncapi/parser-js/actions/runs/5257292254/jobs/9500449903#step:8:2227

@fmvilas
Copy link
Member Author

fmvilas commented Jun 13, 2023

Good catch! I found it on my system by deleting node_modules. It's a corrupt package-lock.json file. I'm pushing a new one.

@sonarcloud
Copy link

sonarcloud bot commented Jun 13, 2023

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 11 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

jonaslagoni
jonaslagoni requested changes Jun 13, 2023
View reviewed changes
Copy link
Member

@jonaslagoni jonaslagoni left a comment

Choose a reason for hiding this comment

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

Why does all these v3 model changes show up? 🤨 Master does not contain any v3 changes?

@fmvilas
Copy link
Member Author

fmvilas commented Jun 13, 2023

master doesn't but next-major-spec does. This PR is not only merging master but also fixing the problems that appeared after doing that. What you see is that, the changes that I had to do to make it work after merging.

@jonaslagoni
Copy link
Member

master doesn't but next-major-spec does. This PR is not only merging master but also fixing the problems that appeared after doing that. What you see is that, the changes that I had to do to make it work after merging.

Ahhh, gotcha 👍

jonaslagoni
jonaslagoni approved these changes Jun 13, 2023
View reviewed changes
Copy link
Member

@jonaslagoni jonaslagoni left a comment

Choose a reason for hiding this comment

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

✅

@jonaslagoni
Copy link
Member

REMEMBER TO MERGE COMMIT

@jonaslagoni
Copy link
Member

/dnm

@fmvilas fmvilas merged commit f551deb into asyncapi:next-major-spec Jun 13, 2023
@fmvilas fmvilas deleted the merge-master-into-next-major-spec branch June 13, 2023 16:33
@jonaslagoni jonaslagoni mentioned this pull request Jun 14, 2023
Closed
@asyncapi-bot
Copy link
Contributor

🎉 This PR is included in version 2.0.3 🎉

The release is available on:

Your semantic-release bot 📦🚀

@jonaslagoni
Copy link
Member

🎉 This PR is included in version 2.0.3 🎉

The release is available on:

* [npm package (@latest dist-tag)](https://www.npmjs.com/package/@asyncapi/parser/v/2.0.3)

* [GitHub release](https://github.com/asyncapi/parser-js/releases/tag/v2.0.3)

Your semantic-release bot 📦🚀

Huh?

@fmvilas
Copy link
Member Author

fmvilas commented Jun 14, 2023

Weird 🤔 @KhudaDad414 you're the most familiar with GitHub actions along with Lukasz. Any idea what's happening?

@KhudaDad414
Copy link
Member

I am assuming it's because of this comment. #717 (comment) 🤔
commit are not included in the release(no possible 😆 ) so I guess we can ignore.

@fmvilas
Copy link
Member Author

fmvilas commented Jun 15, 2023

Are you saying that a comment triggered the release? o.O

@KhudaDad414
Copy link
Member

The release isn't triggered for this branch. It's just a mistrigrered comment.

@asyncapi-bot
Copy link
Contributor

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

The release is available on:

Your semantic-release bot 📦🚀

@asyncapi-bot
Copy link
Contributor

🎉 This PR is included in version 2.2.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

@jonaslagoni jonaslagoni jonaslagoni approved these changes

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

@derberg derberg Awaiting requested review from derberg

@smoya smoya Awaiting requested review from smoya smoya 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
do-not-merge released on @next-major-spec released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.