Skip to content

Commit

Permalink
Merge branch 'master' into feature/add_next_example
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaslagoni authored Aug 8, 2023
2 parents c8517b4 + 2b79906 commit 7511fa9
Show file tree
Hide file tree
Showing 105 changed files with 7,595 additions and 3,543 deletions.
61 changes: 61 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,67 @@
"test",
"infra"
]
},
{
"login": "JFCote",
"name": "Jean-François Côté",
"avatar_url": "https://avatars.githubusercontent.com/u/14336900?v=4",
"profile": "http://jfcote.github.io",
"contributions": [
"code",
"test",
"example",
"doc"
]
},
{
"login": "SumantxD",
"name": "Sumant.xD",
"avatar_url": "https://avatars.githubusercontent.com/u/65810424?v=4",
"profile": "https://github.com/SumantxD",
"contributions": [
"test",
"infra",
"code"
]
},
{
"login": "aryanas159",
"name": "Aryan Singh",
"avatar_url": "https://avatars.githubusercontent.com/u/114330931?v=4",
"profile": "https://github.com/aryanas159",
"contributions": [
"code"
]
},
{
"login": "markuspoerschke",
"name": "Markus Poerschke",
"avatar_url": "https://avatars.githubusercontent.com/u/1222377?v=4",
"profile": "http://markus.poerschke.nrw",
"contributions": [
"code",
"test"
]
},
{
"login": "jamesmoey",
"name": "James Moey",
"avatar_url": "https://avatars.githubusercontent.com/u/457472?v=4",
"profile": "https://github.com/jamesmoey",
"contributions": [
"code",
"test"
]
},
{
"login": "tomwolanski",
"name": "tomwolanski",
"avatar_url": "https://avatars.githubusercontent.com/u/68085653?v=4",
"profile": "https://github.com/tomwolanski",
"contributions": [
"bug"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ src/processors/TemplateInputProcessor.ts
test/processors/TemplateInputProcessor.spec.ts
modelina-website

test/runtime/runtime-**/**
test/runtime/runtime-**
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
33 changes: 33 additions & 0 deletions .github/workflows/runtime-kotlin-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Runtime testing Kotlin models

on:
push:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
paths:
- 'src/generators/kotlin/**'
- 'test/runtime/runtime-kotlin/**'
- 'test/runtime/**kotlin**'

jobs:
test:
name: Runtime testing Kotlin Models
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 Java
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
- name: Generate Kotlin models
run: npm run generate:runtime:kotlin
- name: Run runtime tests
run: npm run test:runtime:kotlin
49 changes: 49 additions & 0 deletions .github/workflows/runtime-php-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Runtime testing PHP models
on:
push:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
paths:
- 'src/generators/php/**'
- 'test/runtime/runtime-php/**'
- 'test/runtime/**php**'

jobs:
runtime-php-test:
name: Runtime testing PHP ${{ matrix.php }} 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
strategy:
fail-fast: false
matrix:
php:
- 8.1
- 8.2
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 14

- name: Build library
run: npm install && npm run build:prod

- name: Setup PHP
uses: shivammathur/setup-php@2.25.2
with:
php-version: ${{ matrix.php }}

- name: Generate Models
run: npm run generate:runtime:php

- name: Install PHP Dependencies
uses: ramsey/composer-install@v2
with:
working-directory: test/runtime/runtime-php

- name: Run runtime tests
run: composer test
working-directory: test/runtime/runtime-php
34 changes: 34 additions & 0 deletions .github/workflows/runtime-typescript-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Runtime Testing TypeScript Models
on:
push:
paths:
- 'src/generators/typescript/**'
- 'test/runtime/runtime-typescript/**'
- 'test/runtime/**typescript**'
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
paths:
- 'src/generators/typescript/**'
- 'test/runtime/runtime-typescript/**'
- 'test/runtime/**typescript**'

jobs:
test:
name: Runtime Testing TypeScript 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: Generate TypeScript models
run: npm run generate:runtime:typescript
- name: Run runtime tests
run: npm run test:runtime:typescript


5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ lib
output
# Where the runtime testing for Java places node modules
java_runtime_node
*.log
*.log

# API documentation
modelina-website/public/docs/api/generated
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
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
lib
node_modules
modelina-website
modelina-website
test/runtime/runtime-**
Loading

0 comments on commit 7511fa9

Please sign in to comment.