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 next-major into master #191

Merged
merged 12 commits into from Apr 27, 2023
Merged

chore: merge next-major into master #191

merged 12 commits into from Apr 27, 2023

Conversation

smoya
Copy link
Member

@smoya smoya commented Mar 31, 2023 •
edited

Description

This PR merges next-major branch into master.

Warning
DO NOT SQUASH. USE REBASE OR MERGE

next-major branch includes the rewrite to TypeScript and adapts to the new Parser-API interface.
It is BC (see commits included with feat!: prefix).

Related issue(s)
asyncapi/parser-js#481

smoya and others added 3 commits March 10, 2023 22:00
@smoya @magicmatatjahu
feat!: implement new Parser-js interface (#168)
5c1bb01 
Also migrate to Typescript

Co-authored-by: Maciej Urbańczyk <urbanczyk.maciej.95@gmail.com>
Co-authored-by: Matatjahu <urbanczyk.maciej.95@gmail.com>
@asyncapi-bot
chore(release): v2.0.0-next-major.1 (#185)
ceff8f0
@smoya
docs: fix mention to the latest version of this package (#186)
97141ce
@smoya smoya changed the title feat!: implement new Parser-js interface chore: merge next-major into master Mar 31, 2023
@smoya smoya changed the title chore: merge next-major into master chore: merge next-major into master Mar 31, 2023
dalelane
dalelane reviewed Apr 6, 2023
View reviewed changes
package.json
@@ -1,14 +1,19 @@
{
"name": "@asyncapi/avro-schema-parser",
"version": "1.1.0",
"version": "2.0.0-next-major.1",
Copy link
Collaborator

Choose a reason for hiding this comment

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

should we update this before merging into master?

dalelane
dalelane previously approved these changes Apr 6, 2023
View reviewed changes
Copy link
Collaborator

@dalelane dalelane left a comment

Choose a reason for hiding this comment

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

🎉

@derberg
Copy link
Member

derberg commented Apr 11, 2023

I really don't understand why this should not be feat!: and squash merged like any other release PR

@smoya
Copy link
Member Author

smoya commented Apr 12, 2023

I really don't understand why this should not be feat!: and squash merged like any other release PR

In this particular case, It is not very critical since I authored all changes in next-major branch. However, it is not a good practice to squash a long-live branch since you lose all commits history, including different commits with different authors. Additionally, minor thing here, you create a fake commit, with a wrong creation date, etc that doesn't represent the real work behind.

@derberg
Copy link
Member

derberg commented Apr 12, 2023 •
edited

since you lose all commits history, including different commits with different authors

we don't loose history, it is all there. We use that approach for 3 years now and it was never a problem

you create a fake commit

it is not a fake commit, it is squash of all commits into one summary to have clean history.

also, why is this a chore: commit? we are merging here entire release branch into master

@smoya
Copy link
Member Author

smoya commented Apr 12, 2023

we don't loose history, it is all there. We use that approach for 3 years now and it was never a problem

If you squash commits into a single one, you lose history.

also, why is this a chore: commit? we are merging here entire release branch into master

It is chore since, if merged and not squashed, the commit feat!: implement new Parser-js interface will remain and added into master, so no need to add another feat!:

@smoya
Copy link
Member Author

smoya commented Apr 12, 2023

@derberg More discussion about it can be found in asyncapi/community#641

@smoya smoya mentioned this pull request Apr 12, 2023
Open
This was referenced Apr 23, 2023
Merged
Merged
@smoya smoya requested a review from dalelane April 25, 2023 10:07
@sonarcloud
Copy link

sonarcloud bot commented Apr 25, 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 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@smoya
Copy link
Member Author

smoya commented Apr 25, 2023

Please @dalelane approve again. Had to update with base branch and your review got dismissed

@M3lkior
Copy link
Collaborator

M3lkior commented Apr 25, 2023

ssed

done :)

@smoya smoya merged commit 01d1afd into master Apr 27, 2023
13 checks passed
@smoya smoya deleted the next-major branch April 27, 2023 10:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dalelane dalelane dalelane approved these changes

@M3lkior M3lkior M3lkior approved these changes

@derberg derberg Awaiting requested review from derberg

@fmvilas fmvilas Awaiting requested review from fmvilas

@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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@smoya @derberg @M3lkior @dalelane @asyncapi-bot