Skip to content

Commit

Permalink
feat: merge master into next (#1427)
Browse files Browse the repository at this point in the history
updates next with all the latest changes on master
  • Loading branch information
jonaslagoni authored Jul 1, 2023
2 parents cd01a8e + 2993acb commit a84bf8d
Show file tree
Hide file tree
Showing 141 changed files with 12,076 additions and 10,400 deletions.
72 changes: 70 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,11 @@
"avatar_url": "https://avatars.githubusercontent.com/u/81870866?v=4",
"profile": "https://github.com/sambhavgupta0705",
"contributions": [
"doc"
"doc",
"review",
"design",
"code",
"bug"
]
},
{
Expand Down Expand Up @@ -579,6 +583,69 @@
"example",
"review"
]
},
{
"login": "Bhavik-ag",
"name": "Bhavik Agarwal",
"avatar_url": "https://avatars.githubusercontent.com/u/73033511?v=4",
"profile": "https://codeyt.com/",
"contributions": [
"design"
]
},
{
"login": "kaushik-rishi",
"name": "Rishi",
"avatar_url": "https://avatars.githubusercontent.com/u/52498617?v=4",
"profile": "https://github.com/kaushik-rishi",
"contributions": [
"code",
"design"
]
},
{
"login": "RohithBoppey",
"name": "Rohith Boppey",
"avatar_url": "https://avatars.githubusercontent.com/u/73538974?v=4",
"profile": "https://rohithboppey.netlify.app",
"contributions": [
"code",
"design"
]
},
{
"login": "Shurtu-gal",
"name": "Ashish Padhy",
"avatar_url": "https://avatars.githubusercontent.com/u/100484401?v=4",
"profile": "http://ashishpadhy.live",
"contributions": [
"code",
"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"
]
}
],
"contributorsPerLine": 7,
Expand All @@ -587,5 +654,6 @@
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": false,
"commitConvention": "none"
"commitConvention": "none",
"commitType": "docs"
}
16 changes: 16 additions & 0 deletions .asyncapi-tool
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"title": "AsyncAPI Modelina",
"description": "Generate payload models into Java, TypeScript, Go, etc, you name it, from AsyncAPI documents. This tool gives you full control over the models through high customization",
"links": {
"websiteUrl": "https://modelina.org",
"docsUrl": "https://github.com/asyncapi/modelina/tree/master/docs",
"repoUrl": "https://github.com/asyncapi/modelina"
},
"filters": {
"language": "TypeScript",
"technology": ["React JS", "Docker"],
"categories": ["code-generator"],
"hasCommercial": false,
"isAsyncAPIOwner": true
}
}
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ src/processors/TemplateInputProcessor.ts
test/processors/TemplateInputProcessor.spec.ts
modelina-website

test/runtime/runtime-**/**
test/runtime/runtime-**
4 changes: 2 additions & 2 deletions .github/workflows/if-nodejs-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
run: npm install
- if: steps.packagejson.outputs.exists == 'true'
name: Add plugin for conventional commits for semantic-release
run: npm install [email protected]
run: npm install --save-dev [email protected]
- if: steps.packagejson.outputs.exists == 'true'
name: Publish to any of NPM, Github, and Docker Hub
id: release
Expand All @@ -123,4 +123,4 @@ jobs:
fields: repo,action,workflow
text: 'Release workflow failed in release job'
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CI_FAIL_NOTIFY }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CI_FAIL_NOTIFY }}
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/[email protected]
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
36 changes: 36 additions & 0 deletions .github/workflows/runtime-rust-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Runtime Testing Rust Models
on:
push:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
paths:
- 'src/generators/rust/**'
- 'test/runtime/runtime-rust/**'
- 'test/runtime/**rust**'

jobs:
test:
name: Runtime Testing Rust 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: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
components: rustfmt, clippy, rust-src
- name: Generate Rust models
run: npm run generate:runtime:rust
- name: Run runtime tests
run: npm run test:runtime:rust


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


17 changes: 0 additions & 17 deletions .github/workflows/website-deploy.yml

This file was deleted.

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: 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 a84bf8d

Please sign in to comment.