Skip to content

Commit 73f2e64

Browse files
authored
Merge pull request #4490 from OAI/main
dev: update from main
2 parents bb79c48 + b9c0963 commit 73f2e64

File tree

5 files changed

+54
-16
lines changed

5 files changed

+54
-16
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve the specification
4+
title: 'vX.Y: ...'
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the error in the specification**
11+
A clear and concise description of
12+
- what the error is,
13+
- which specification versions are affected,
14+
- what you would expect the specification to say instead, and
15+
- a link to the corresponding specification section in the "oldest" affected version.
16+
17+
**Additional context**
18+
Add any other context about the problem here.

CONTRIBUTING.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ Draft pull requests can still be reviewed while in draft state.
165165

166166
### Preview specification HTML locally
167167

168+
> [!NOTE]
169+
> `npm run build-src` calls bash scripts. Use [Git Bash](https://gitforwindows.org/) on Windows, or use the Windows Subsystem for Linux (WSL).
170+
168171
The markdown source files are converted to HTML before publishing.
169172
To do this locally, please
170173

@@ -199,7 +202,7 @@ The steps for creating a `vX.Y.Z-rel` branch are:
199202

200203
1. Update `EDITORS.md` on `main`
201204
2. Merge `main` into `dev` and `dev` into `vX.Y-dev` via PRs
202-
- Sync PRs are automatically created by workflows `sync-main-to-dev` and `sync-dev-to-vX.Y-dev`
205+
- sync PRs are automatically created by workflows `sync-main-to-dev` and `sync-dev-to-vX.Y-dev`
203206
3. Prepare spec files in `vX.Y-dev`
204207
- `npm run format-markdown`
205208
- `npm run build-src`
@@ -211,6 +214,7 @@ The steps for creating a `vX.Y.Z-rel` branch are:
211214
- copy `EDITORS.md` to `versions/X.Y.Z-editors.md`
212215
- delete `src/schemas`
213216
- delete `tests/schema`
217+
- bash script `scripts/adjust-release-branch.sh` performs these steps
214218
5. Merge `vX.Y.Z-rel` into `main` via PR
215219
- this PR should only add files `versions/X.Y.Z.md` and `versions/X.Y.Z-editors.md`
216220

package-lock.json

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "oas-schemas",
3-
"version": "2.0.0",
4-
"description": "OpenAPI Specification JSON schemas",
2+
"name": "oas-infra",
3+
"version": "0.0.0",
4+
"description": "OpenAPI Specification Automation & Infrastructure",
55
"author": {
66
"name": "OpenAPI Initiative TSC",
77
"email": "[email protected]",
@@ -19,16 +19,11 @@
1919
"format-markdown": "bash ./scripts/format-markdown.sh ./src/oas.md",
2020
"validate-markdown": "npx mdv src/oas.md && npx markdownlint-cli src/oas.md"
2121
},
22-
"readmeFilename": "README.md",
23-
"files": [
24-
"README.md",
25-
"schemas/*"
26-
],
2722
"dependencies": {
2823
"cheerio": "^1.0.0-rc.5",
2924
"highlight.js": "^11.11.1",
3025
"markdown-it": "^14.1.0",
31-
"respec": "35.2.3",
26+
"respec": "35.3.0",
3227
"yargs": "^17.7.2"
3328
},
3429
"devDependencies": {

scripts/adjust-release-branch.sh

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/usr/bin/env bash
2+
3+
# Author: @ralfhandl
4+
5+
# Run this script from the root of the repo. It is designed to be run manually in a release branch.
6+
7+
branch=$(git branch --show-current)
8+
9+
if [[ ! $branch =~ ^v[0-9]+\.[0-9]+\.[0-9]+-rel$ ]]; then
10+
echo "This script is intended to be run from a release branch, e.g. v3.1.2-rel"
11+
exit 1
12+
fi
13+
14+
vVersion=$(basename "$branch" "-rel")
15+
version=${vVersion:1}
16+
echo Prepare release of $version
17+
18+
cp EDITORS.md versions/$version-editors.md
19+
mv src/oas.md versions/$version.md
20+
rm -r src/schemas
21+
rm -r tests/schema

0 commit comments

Comments
 (0)