Skip to content

Commit

Permalink
Merge branch 'master' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaslagoni authored Jan 26, 2024
2 parents e3b1c96 + f70a97e commit 75db7c8
Show file tree
Hide file tree
Showing 18 changed files with 639 additions and 190 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/runtime-scala-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Runtime testing Scala models

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

jobs:
test:
name: Runtime testing Scala Models
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Check package-lock version
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
id: lockversion
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
- 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 Scala models
run: npm run generate:runtime:scala
- name: Run runtime tests
run: npm run test:runtime:scala
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ java_runtime_node
*.log
# Local Netlify folder
.netlify
.metals
.scala-build
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ Whatever interaction you need, you can create.</td>
```typescript
const models = await generator.generate(input);
for (const model in models) {
const generatedCode = generatedModel.result;
const dependencies = generatedModel.dependencies;
const modeltype = generatedModel.model.type;
const modelName = generatedModel.modelName;
const generatedCode = model.result;
const dependencies = model.dependencies;
const modeltype = model.type;
const modelName = model.modelName;
...
}
```
Expand Down
4 changes: 2 additions & 2 deletions modelina-website/src/components/layouts/NavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ export default function NavBar({ className = '', hideLogo = false }) {

return (
<div className={`bg-white ${className} z-50`}>
<div className="flex w-full justify-between items-center py-6 lg:justify-start lg:space-x-10">
<div className="flex w-full justify-between items-center py-3 lg:justify-start lg:space-x-10">
{!hideLogo && (
<div className="lg:w-auto lg:flex-1">
<div className="flex">
<Link href="https://modelina.org/" className="cursor-pointer">
<ModelinaLogo className="h-16 w-auto sm:h-12" />
<ModelinaLogo className="h-12 w-auto sm:h-16" />
</Link>
</div>
</div>
Expand Down
Loading

0 comments on commit 75db7c8

Please sign in to comment.