Skip to content

junk: test a 3.1 patch release #40

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

Closed
wants to merge 95 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
e9eef10
Initialize src/oas.md from 3.1.1.md
handrews Nov 10, 2024
76409f4
Initialize schemas from v3.1
handrews Nov 10, 2024
67b94d9
Start next patch - bump version to 3.1.2
handrews Oct 24, 2024
f39b788
Validate src/oas.md
ralfhandl Nov 13, 2024
866e92f
Merge pull request #4196 from ralfhandl/v3.1-validate-oas.md
handrews Nov 13, 2024
4ae387f
Use dev schema for schema tests
ralfhandl Nov 13, 2024
b5d5809
Validate src/oas.md
ralfhandl Nov 13, 2024
95ee947
Merge pull request #4199 from ralfhandl/dev-validate-oas.md
lornajane Nov 14, 2024
165a5a4
Merge pull request #4198 from ralfhandl/dev-schema-tests
handrews Nov 21, 2024
b7f68a9
Merge remote-tracking branch 'upstream/main' into dev-update-from-main
ralfhandl Nov 21, 2024
98725de
Merge pull request #4216 from ralfhandl/dev-update-from-main
handrews Nov 21, 2024
a9643e1
Update schema.yaml in src
ralfhandl Nov 21, 2024
77c76f8
Merge pull request #4218 from ralfhandl/dev-update-src-schema
handrews Nov 21, 2024
d48ff11
Merge branch 'dev' into v3.1-dev-update-from-dev
ralfhandl Nov 21, 2024
5a0a0e8
Merge pull request #4219 from ralfhandl/v3.1-dev-update-from-dev
handrews Nov 21, 2024
3d83a95
Build HTML from src/oas.md
ralfhandl Dec 16, 2024
21b5bcf
Editorial change: Link Object points to Operation Object
char0n Dec 17, 2024
c15db13
Merge pull request #4260 from char0n/char0n/link-operation
ralfhandl Dec 18, 2024
fe5b234
Editorial change: Include Header Object into 'Working With Examples' …
char0n Dec 18, 2024
7cd34d2
Editorial change: fix typo in Link Object description
char0n Dec 18, 2024
1b65003
Update src/oas.md
char0n Dec 18, 2024
8cc59b6
Update src/oas.md
char0n Dec 18, 2024
150e125
Update src/oas.md
char0n Dec 18, 2024
377e124
Update src/oas.md
char0n Dec 18, 2024
6eb487b
Editorial change: add Header Object to Generating and Validating URIs…
char0n Dec 18, 2024
f896bb7
Update src/oas.md
char0n Dec 18, 2024
2dcd87d
Merge pull request #4266 from char0n/char0n/refereced-typo
ralfhandl Dec 19, 2024
8598f2f
Merge pull request #4267 from char0n/char0n/generating-and-validating…
ralfhandl Dec 19, 2024
4e4a292
Merge pull request #4265 from char0n/char0n/add-header-into-working-w…
handrews Dec 19, 2024
a3425f2
builld into deploy-preview
ralfhandl Dec 19, 2024
e738e4a
Introduce constraints for Server Object url fixed field
char0n Dec 19, 2024
8b91379
Update src/oas.md
char0n Dec 20, 2024
ccf329f
Update src/oas.md
char0n Dec 20, 2024
984ee11
Merge pull request #4271 from OAI/main
ralfhandl Dec 21, 2024
0b187b6
Temp files in deploy-preview
ralfhandl Dec 23, 2024
b9c7b91
Tempfile in folder next to js folder
ralfhandl Dec 23, 2024
4fc2fdb
Merge pull request #4272 from swaggerexpert/char0n/server-url-constra…
ralfhandl Jan 3, 2025
1e0fd70
Editorial change: fix anchor to Components.securitySchemes
char0n Dec 27, 2024
126d46a
Merge remote-tracking branch 'upstream/dev' into dev-build-src
ralfhandl Jan 8, 2025
dbba0ba
Fix copy-paste "format: binary" error
handrews Jan 9, 2025
f48940c
Typo
ralfhandl Jan 10, 2025
0178e80
Merge pull request #4282 from swaggerexpert/char0n/fix-components-sec…
ralfhandl Jan 10, 2025
9291879
Merge pull request #4294 from handrews/copy-paste
ralfhandl Jan 10, 2025
8a2bb17
Preview and lint spec changes
ralfhandl Jan 15, 2025
e8a0d07
Merge pull request #4254 from ralfhandl/dev-build-src
handrews Jan 15, 2025
5b0a31a
Feedback from mkistler about contentEncoding
handrews Jan 15, 2025
628e971
Apply suggestions from code review
ralfhandl Jan 16, 2025
a922855
Merge pull request #4301 from handrews/copy-paste-2
ralfhandl Jan 17, 2025
cde67e1
validate markdown in build-src
ralfhandl Jan 18, 2025
bf9155d
Merge pull request #4311 from ralfhandl/dev-validate-markdown-in-buil…
ralfhandl Jan 22, 2025
39c3571
Adjust uri to uri-reference for security schema fixed fields
markrzen Feb 4, 2025
8a686f6
as decided in TDC call on 2025-01-23
ralfhandl Feb 5, 2025
17ab8d6
Update CONTRIBUTING.md
ralfhandl Feb 5, 2025
78320b6
New script format-markdown
ralfhandl Feb 6, 2025
5d505db
Update CONTRIBUTING.md
ralfhandl Feb 6, 2025
b7163c1
Reactor all but xml.namespace from uri to uri-reference
markrzen Feb 6, 2025
c2c9aaf
Update CONTRIBUTING.md
ralfhandl Feb 6, 2025
97e7b3d
Update CONTRIBUTING.md
ralfhandl Feb 7, 2025
328d6a3
Merge remote-tracking branch 'upstream/main' into dev-update-from-main
ralfhandl Feb 10, 2025
d22d504
Merge pull request #4328 from markrzen/patch-2
ralfhandl Feb 13, 2025
0980f61
Merge pull request #4344 from ralfhandl/dev-update-from-main
ralfhandl Feb 13, 2025
4dc85ae
Update src schema with changes from #4328
ralfhandl Feb 13, 2025
cefa986
Remove obsolete schemas folder
ralfhandl Feb 13, 2025
70ae381
Adjust README.md
ralfhandl Feb 13, 2025
d6d0fe7
Update schema-publish.yaml
ralfhandl Feb 13, 2025
b54b525
No loop, just work on src/schemas/validation
ralfhandl Feb 13, 2025
9d4f648
Update schema-publish.yaml
ralfhandl Feb 13, 2025
c43615c
npm script for building schemas locally
ralfhandl Feb 14, 2025
183ac8b
Run only on changes to inputs and scripts
ralfhandl Feb 14, 2025
bd302e3
Update schema-publish.yaml
ralfhandl Feb 14, 2025
494222b
Use branch name
ralfhandl Feb 14, 2025
ed39e4a
Merge pull request #4331 from ralfhandl/v3.1-field-names-and-values-i…
ralfhandl Feb 16, 2025
4600360
Merge pull request #4336 from ralfhandl/dev-format-src-oas.md
ralfhandl Feb 17, 2025
0cb336b
Editorial change: fix typo in runtime expression CHAR non-terminal
char0n Feb 17, 2025
1919c0b
build-src uses build.sh, remove build-src.sh
ralfhandl Feb 18, 2025
aaa779b
Update src/schemas/validation/README.md
ralfhandl Feb 18, 2025
0a41814
Update schema-publish.sh
ralfhandl Feb 18, 2025
3e2604f
Merge branch 'dev-schemas-live-in-src' of https://github.com/ralfhand…
ralfhandl Feb 18, 2025
6f75109
Update package.json
ralfhandl Feb 18, 2025
f0fad47
Merge pull request #4368 from swaggerexpert/char0n/runtime-expressions
lornajane Feb 20, 2025
9fd4e2e
Merge pull request #4360 from ralfhandl/v3.1-uri-reference
lornajane Feb 20, 2025
35b2333
Merge pull request #4369 from ralfhandl/dev-one-spec-build-script
lornajane Feb 20, 2025
afa9511
Update schema-publish.yaml
ralfhandl Feb 20, 2025
90f9f2f
Update README.md
ralfhandl Feb 20, 2025
92e5fc9
Merge pull request #4361 from ralfhandl/dev-schemas-live-in-src
lornajane Feb 20, 2025
5dc0d94
Use correct pattern
ralfhandl Feb 21, 2025
4056207
Merge pull request #4378 from ralfhandl/dev-fix-schema-publish.yaml
lornajane Feb 22, 2025
20117c7
Update schema-publish.sh
duncanbeevers Feb 15, 2025
5c8ce0e
Merge pull request #4376 from duncanbeevers/dev-schemas-live-in-src
ralfhandl Feb 25, 2025
8a2e070
Remove yaml2json
duncanbeevers Feb 27, 2025
9f113bd
Merge pull request #4386 from duncanbeevers/remove-yaml2json
ralfhandl Feb 28, 2025
8eb4d58
Merge remote-tracking branch 'upstream/main' into dev
ralfhandl Feb 28, 2025
93805bd
Merge branch 'dev' into v3.1-rel-test
ralfhandl Feb 28, 2025
3db7c5e
Prepare spec document
ralfhandl Feb 28, 2025
fedf1d0
Merge remote-tracking branch 'upstream/main' into v3.1-rel-test
ralfhandl Mar 5, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions .github/workflows/schema-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@ name: schema-publish
# issue: https://github.com/OAI/OpenAPI-Specification/issues/3715

#
# This workflow copies the 3.x schemas to the gh-pages branch
# This workflow creates a pull request for publishing schema iterations to the gh-pages branch
#

# run this on push to main
# run this on push to vX.Y-dev branches or manually
on:
push:
branches:
- main
- 'v[0-9].[0-9]-dev'
paths:
- 'src/schemas/validation/*.yaml'
- 'scripts/schema-publish.sh'
- '.github/workflows/schema-publish.yaml'
workflow_dispatch: {}

jobs:
Expand All @@ -26,7 +30,7 @@ jobs:

- uses: actions/setup-node@v4 # setup Node.js
with:
node-version: '20.x'
node-version: '22.x'

- name: Install dependencies
run: npm ci
Expand All @@ -43,15 +47,15 @@ jobs:
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: publish-schema-iteration
branch: ${{ github.ref_name }}-publish-schema-iteration
base: gh-pages
delete-branch: true
path: deploy
labels: Housekeeping,Schema
reviewers: darrelmiller,webron,earth2marsh,webron,lornajane,mikekistler,miqui,ralfhandl,handrews,karenetheridge
title: Publish OpenAPI Schema Iterations
title: '${{ github.ref_name }}: publish OpenAPI schema iterations'
commit-message: New OpenAPI schema iterations
signoff: true
body: |
This pull request is automatically triggered by GitHub action `schema-publish`.
The `schemas/**/*.yaml` files have changed and JSON files are automatically generated.
This pull request is automatically generated by GitHub action `schema-publish`.
The `src/schemas/validation/*.yaml` files have changed and JSON files are automatically generated.
4 changes: 2 additions & 2 deletions .github/workflows/validate-markdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
node-version: '20.x'

- name: Validate markdown
run: npx --yes mdv versions/3.*.md
run: npx --yes mdv versions/3.*.md src/oas.md

- name: Lint markdown 3.0.4, 3.1.1, and later
run: npx --yes markdownlint-cli --config .markdownlint.yaml versions/3.0.4.md versions/3.1.[^0].md versions/3.[2-9].*.md
run: npx --yes markdownlint-cli --config .markdownlint.yaml versions/3.0.4.md versions/3.1.[^0].md versions/3.[2-9].*.md src/oas.md
13 changes: 13 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,19 @@ This might apply to, for example, Markdown files, automation, and scripts.
For all pull requests, if they should not be merged yet for any reason (they depend on something else, you would like feedback from a specific reviewer), mark them as draft and they will not be merged while in that state.
Draft pull requests can still be reviewed while in draft state.

### Preview specification HTML locally

The markdown source files are converted to HTML before publishing.
To do this locally, please

1. Install [Node.js](https://nodejs.org/)
2. Check out this repo, go to the repo root, and switch to a development branch
3. Execute `npm install` (once, repeat after merging upstream changes)
4. Execute `npm run build-src` after changing `src/oas.md` (this first executes `npm run validate-markdown`, which can also be run separately)
5. Open output file `deploy-preview/oas.html` with a browser and check your changes

Please make sure the markdown validates and builds using the above steps before creating a pull request or marking a draft pull request as ready for review.

## Reviewers

> [!NOTE]
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
"license": "Apache-2.0",
"scripts": {
"build": "bash ./scripts/md2html/build.sh",
"test": "c8 --100 vitest --watch=false && bash scripts/schema-test-coverage.sh"
"build-src": "npm run validate-markdown && bash ./scripts/md2html/build.sh src && bash ./scripts/schema-publish.sh src",
"test": "c8 --100 vitest --watch=false && bash scripts/schema-test-coverage.sh",
"format-markdown": "bash ./scripts/format-markdown.sh ./src/oas.md",
"validate-markdown": "npx mdv src/oas.md && npx markdownlint-cli src/oas.md"
},
"readmeFilename": "README.md",
"files": [
Expand Down
5 changes: 0 additions & 5 deletions schemas/v1.2/README.md

This file was deleted.

61 changes: 0 additions & 61 deletions schemas/v1.2/apiDeclaration.json

This file was deleted.

59 changes: 0 additions & 59 deletions schemas/v1.2/authorizationObject.json

This file was deleted.

132 changes: 0 additions & 132 deletions schemas/v1.2/dataType.json

This file was deleted.

Loading
Loading