Skip to content

v3.2-dev: update from dev #4723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Jun 15, 2025
Merged

v3.2-dev: update from dev #4723

merged 22 commits into from
Jun 15, 2025

Conversation

github-actions[bot]
Copy link
Contributor

Merge dev into v3.2-dev.

handrews and others added 21 commits June 12, 2025 18:28
But don't count standard JSON Schema keywords.
There needs to be a local `$dynamicAnchor`, but it is never
actually evaluated.
Co-authored-by: Ralf Handl <[email protected]>
Co-authored-by: Ralf Handl <[email protected]>
Since we are testing with a placeholder, we need to match
the placeholder.  This will unfortunately need to be different
on each new release line branch, so let's separate this test
case into its own file.
Use full schema (schema-base.yaml) in schema.test.mjs
Use full schema (schema-base.yaml) for coverage
dev: update from main
dev: update from main
…ests

schema test coverage: set exit code only if base branch is not dev
dev: update from main
and remove unnecessary code, thanks to @jdesrosiers
main: determine OAS Base Vocab name from meta.yaml for schema test coverage
dev: update from main
@github-actions github-actions bot requested review from a team as code owners June 14, 2025 17:48
dev: don't hard-code vocabulary in test code
Comment on lines +1 to +15
openapi: 3.1.0
info:
summary: Testing jsonSchemaDialect
title: My API
version: 1.0.0
license:
name: Apache 2.0
identifier: Apache-2.0
jsonSchemaDialect: https://spec.openapis.org/oas/3.1/dialect/WORK-IN-PROGRESS
components:
schemas:
WithDollarSchema:
$id: "locked-metaschema"
$schema: https://spec.openapis.org/oas/3.1/dialect/WORK-IN-PROGRESS
paths: {}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ralfhandl I don't understand what is going on here as this file already exists on v3.2-dev?

@@ -6,7 +6,6 @@ info:
license:
name: Apache 2.0
identifier: Apache-2.0
jsonSchemaDialect: https://spec.openapis.org/oas/3.1/dialect/base
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ralfhandl likewise this change is already there?

@handrews
Copy link
Member

@ralfhandl I guess if this merges fine go ahead, I'm just confused about what look like duplicates. But I guess they aren't conflicts b/c they are already there? I cherry-picked that commit and applied it IIRC.

Copy link
Member

@handrews handrews left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess if git doesn't think it's a conflict it's not a conflict, so let's merge it.

@handrews
Copy link
Member

oh but now there is a conflict, I just wasn't looking in the right place... hmm..

@handrews
Copy link
Member

@ralfhandl how do we keep this from happening with every auto-merge to 3.2? Sorry I seem to have messed this up.

@ralfhandl ralfhandl closed this Jun 15, 2025
@ralfhandl ralfhandl reopened this Jun 15, 2025
@handrews handrews merged commit bdfbbcf into v3.2-dev Jun 15, 2025
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants