Skip to content

Commit

Permalink
Merge branch 'next' into fix_pydantic_serializer_dictionary
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaslagoni committed Jun 24, 2024
2 parents f364c88 + efd127a commit 0ebcefe
Show file tree
Hide file tree
Showing 45 changed files with 8,469 additions and 20,096 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/upload-release-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ jobs:
dist_folder: macos
extension: x64.pkg
steps:
- name: Set git to use LF #to once and for all finish neverending fight between Unix and Windows
run: |
git config --global core.autocrlf false
git config --global core.eol lf
- name: Checkout repository
uses: actions/checkout@v3
- name: Check package-lock version
Expand Down
4 changes: 2 additions & 2 deletions examples/go-json-tags/__snapshots__/index.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ exports[`Should be able to render json-tags in struct and should log expected ou
Array [
"// Root represents a Root model.
type Root struct {
Cities *Cities \`json:\\"cities\\"\`
Options *Options \`json:\\"options\\"\`
Cities *Cities \`json:\\"cities,omitempty\\"\`
Options *Options \`json:\\"options,omitempty\\"\`
}",
]
`;
Expand Down
5 changes: 2 additions & 3 deletions examples/go-union-type/__snapshots__/index.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ type AdditionalProperty struct {
AdditionalPropertyOneOf_1
string
float64
ModelinaArrType []string
ModelinaArrType []Union
ModelinaArrType
AdditionalPropertyOneOf_6
}",
]
Expand All @@ -21,7 +20,7 @@ Array [
type Union struct {
string
float64
ModelinaAnyType interface{}
ModelinaAnyType
}",
]
`;
Expand Down
4 changes: 3 additions & 1 deletion modelina-cli/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ oclif.manifest.json
dist

# Because we cant use local references (bug with windows build), we have to pack the dependency ourself
scripts/modelina-package
scripts/modelina-package
test/fixtures/generate
coverage
5 changes: 3 additions & 2 deletions modelina-cli/.mocharc.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"require": [
"ts-node/register"
"ts-node/register",
"test/test_helpers/init.js"
],
"watch-extensions": [
"ts"
],
"recursive": true,
"reporter": "spec",
"timeout": 60000,
"timeout": 100000,
"node-option": [
"loader=ts-node/esm",
"experimental-specifier-resolution=node"
Expand Down
Loading

0 comments on commit 0ebcefe

Please sign in to comment.