3.1.1: update from main #4074

ralfhandl · 2024-09-06T09:06:23Z

This merges current main into v3.1.1-dev, resolving the three merge conflicts in

.gitignore: taken from main
validate-markdown.yaml: taken from v3.1.1-dev
3.1.0.md: taken from main

merging per today's TDC call

Merging per today's TDC call

merging per today's TDC call

Workflows run from the workflow file on main, even when they run on branches. But just running "npm i" or a command like "npx" that also installs packages uses the package.json file from the branch. Rather than attempt to keep the branch package files up-to-date (which would _quadruple_ the number of update PRs, adding three branch update PRs for every dependabot PR), let's just checkout the package.json from main whenver we run. The other workflows only run on main - these two are the ones that run on branches.

Always checkout JavaScript environment from main

…ekeeping time (OAI#3522) * Remove old backlog agenda and unused tag filters from weekly meeting agenda, add housekeeping entry * Update agenda.md Building on Lorna's work, this: - changes housekeeping to governance to avoid conflict with the issue label - tightens up the instructions (wordsmithing and general cleanup) - re-orders meeting info and CoC - shortens the ideal time for the first two items to 5 mins --------- Co-authored-by: Marsh Gardiner <[email protected]>

Signed-off-by: Vincent Biret <[email protected]>

moving Uri to emeritus

Signed-off-by: Mike Ralphson <[email protected]> Co-authored-by: Mike Ralphson <[email protected]>

adds missing package lock for reproductible CI

Fix validate script

Checkout package-lock.json from main and use node v20. Add --yes to npx because it seems to need it when run locally, although it's probably redundant in the CI environment. But it's safe to include.

…Specification into clean-guidelines

Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 1.2.2 to 1.3.0. - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v1.3.0/packages/vitest) --- updated-dependencies: - dependency-name: vitest dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

….3.0 Bump vitest from 1.2.2 to 1.3.0

In yet another attempt to prevent people from opening PRs that we cannot accept.

Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 1.3.0 to 1.3.1. - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v1.3.1/packages/vitest) --- updated-dependencies: - dependency-name: vitest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

….3.1 Bump vitest from 1.3.0 to 1.3.1

Clean guidelines

Bumps [yaml](https://github.com/eemeli/yaml) from 2.3.4 to 2.4.0. - [Release notes](https://github.com/eemeli/yaml/releases) - [Commits](eemeli/yaml@v2.3.4...v2.4.0) --- updated-dependencies: - dependency-name: yaml dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>

Bump yaml from 2.3.4 to 2.4.0

* Added security considerations document * Update SECURITY_CONSIDERATIONS.md Co-authored-by: Asbjørn Ulsberg <[email protected]> * Update SECURITY_CONSIDERATIONS.md Co-authored-by: Asbjørn Ulsberg <[email protected]> * Add note about external references being potentially on untrusted domains * Update SECURITY_CONSIDERATIONS.md Co-authored-by: Ralf Handl <[email protected]> * Update SECURITY_CONSIDERATIONS.md Co-authored-by: Lorna Jane Mitchell <[email protected]> * Added note about security schemes --------- Co-authored-by: Asbjørn Ulsberg <[email protected]> Co-authored-by: Ralf Handl <[email protected]> Co-authored-by: Lorna Jane Mitchell <[email protected]>

Add markdown style guide to CONTRIBUTING

EDITORS.md: list of current and former specification editors

build script: example links point to HTML wrapper on learn site

Bumps [@hyperjump/json-schema](https://github.com/hyperjump-io/json-schema) from 1.9.6 to 1.9.8. - [Commits](hyperjump-io/json-schema@v1.9.6...v1.9.8) --- updated-dependencies: - dependency-name: "@hyperjump/json-schema" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

…p/json-schema-1.9.8 Bump @hyperjump/json-schema from 1.9.6 to 1.9.8

Bumps [yaml](https://github.com/eemeli/yaml) from 2.5.0 to 2.5.1. - [Release notes](https://github.com/eemeli/yaml/releases) - [Commits](eemeli/yaml@v2.5.0...v2.5.1) --- updated-dependencies: - dependency-name: yaml dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>

Bump yaml from 2.5.0 to 2.5.1

handrews · 2024-09-06T15:21:49Z

Why are we merging main into 3.1.1 when we're just about to merge 3.1.1 into main? Apologies if I missed somewhere that documents this.

handrews · 2024-09-07T00:41:20Z

Same as 3.0.4: From a DM conversation, apparently this is how it's preferred to resolve conflicts, which seems messy to me but I won't object to it.

handrews

I think all I really care about here is that 3.1.1.md was not changed, and that looks correct here. 3.1.0.md being taken from main is also correct and fixes an annoying problem with branch divergence.

miqui

almost done

earth2marsh and others added 30 commits February 1, 2024 09:42

Merge pull request OAI#3355 from handrews/path-item-ref

54a7c9f

merging per today's TDC call

Merge pull request OAI#3455 from davishmcclurg/uri-reference

0e13e78

Merging per today's TDC call

Update .github/pull_request_template.md

b55f405

Merge pull request OAI#3533 from handrews/pr-template

1de526f

merging per today's TDC call

Merge pull request OAI#3554 from handrews/use-main-js

b175961

Always checkout JavaScript environment from main

Update SIGs list, improve formatting and links (OAI#3551)

9b99ffb

- adds missing package-lock

87f5bdb

Signed-off-by: Vincent Biret <[email protected]>

- switches to npm ci

b9b1ac4

Signed-off-by: Vincent Biret <[email protected]>

- updates schema validation workflow to checkout the lock

9a76230

Signed-off-by: Vincent Biret <[email protected]>

Update MAINTAINERS.md (OAI#3562)

ec5161f

moving Uri to emeritus

Fix validate script

0e3f97e

fix: GitHub changed markdown rendering for headings/anchors (OAI#3548)

7cc8f4c

Signed-off-by: Mike Ralphson <[email protected]> Co-authored-by: Mike Ralphson <[email protected]>

Merge pull request OAI#3564 from baywet/bugfix/package-lock

617f3d9

adds missing package lock for reproductible CI

Merge pull request OAI#3568 from jdesrosiers/fix-validation-script

21e2c2e

Fix validate script

Align the markdown workflow with the others (OAI#3570)

b3f5d93

Checkout package-lock.json from main and use node v20. Add --yes to npx because it seems to need it when run locally, although it's probably redundant in the CI environment. But it's safe to include.

remove guideline

4927770

Merge branch 'clean-guidelines' of https://github.com/LasneF/OpenAPI-…

f7494e0

…Specification into clean-guidelines

Merge pull request OAI#3592 from OAI/dependabot/npm_and_yarn/vitest-1…

19765c1

….3.0 Bump vitest from 1.2.2 to 1.3.0

Add essential policies

02e770a

In yet another attempt to prevent people from opening PRs that we cannot accept.

Merge pull request OAI#3600 from OAI/dependabot/npm_and_yarn/vitest-1…

10edfe7

….3.1 Bump vitest from 1.3.0 to 1.3.1

Merge pull request OAI#3580 from LasneF/clean-guidelines

bd2fb87

Clean guidelines

Merge pull request OAI#3611 from OAI/dependabot/npm_and_yarn/yaml-2.4.0

6f38696

Bump yaml from 2.3.4 to 2.4.0

Remove disclaimer per review feedback.

4a11c66

Fix: OAI#3619. Reference IANA media type page.

375f44b

ralfhandl and others added 11 commits August 20, 2024 15:38

Merge remote-tracking branch 'upstream/main' into markdown-style-guide

305daf5

Don't rely on toc-end comment

3c2c9c6

Update package-lock.json

0304666

Merge pull request OAI#4027 from OAI/markdown-style-guide

097ee45

Add markdown style guide to CONTRIBUTING

Merge pull request OAI#4022 from ralfhandl/main-update-maintainers

f8114db

EDITORS.md: list of current and former specification editors

Merge pull request OAI#4033 from ralfhandl/main-script-tweaks

c754de0

build script: example links point to HTML wrapper on learn site

Merge pull request OAI#4049 from OAI/dependabot/npm_and_yarn/hyperjum…

4e9d2b3

…p/json-schema-1.9.8 Bump @hyperjump/json-schema from 1.9.6 to 1.9.8

Merge pull request OAI#4068 from OAI/dependabot/npm_and_yarn/yaml-2.5.1

7aa5766

Bump yaml from 2.5.0 to 2.5.1

Merge remote-tracking branch 'upstream/main' into 3.1.1-update-from-main

3d62acb

ralfhandl requested review from lornajane, handrews and a team September 6, 2024 09:12

ralfhandl added this to the v3.1.1 milestone Sep 6, 2024

ralfhandl added Housekeeping Process labels Sep 6, 2024

Remove helper script for editors

fb98b99

This was referenced Sep 6, 2024

Dummy PR for merging 3.1.1 into main #4076

Closed

Open Community (TDC) Meeting, Thursday 12 September 2024 #4072

Closed

handrews approved these changes Sep 9, 2024

View reviewed changes

ralfhandl requested review from earth2marsh, miqui and mikekistler September 10, 2024 08:24

miqui reviewed Sep 11, 2024

View reviewed changes

miqui approved these changes Sep 11, 2024

View reviewed changes

miqui merged commit 9311268 into OAI:v3.1.1-dev Sep 11, 2024
4 checks passed

ralfhandl deleted the 3.1.1-update-from-main branch September 11, 2024 07:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

3.1.1: update from main #4074

3.1.1: update from main #4074

ralfhandl commented Sep 6, 2024 •

edited

Loading

handrews commented Sep 6, 2024

handrews commented Sep 7, 2024

handrews left a comment

miqui left a comment

3.1.1: update from main #4074

3.1.1: update from main #4074

Conversation

ralfhandl commented Sep 6, 2024 • edited Loading

handrews commented Sep 6, 2024

handrews commented Sep 7, 2024

handrews left a comment

Choose a reason for hiding this comment

miqui left a comment

Choose a reason for hiding this comment

ralfhandl commented Sep 6, 2024 •

edited

Loading