3.0.4: update from main #4065
Merged
3.0.4: update from main #4065
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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]>
Signed-off-by: Vincent Biret <[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.
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 essential policies to DEVELOPMENT.md
Fix: OAI#3619. Reference IANA media type page.
Thank you, @MikeRalphson , for all your contributions through the years, and we hope to see more of you in the future whenever you're able. 🙏
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
This was referenced Sep 6, 2024
mikekistler
approved these changes
Sep 6, 2024
There was a problem hiding this comment.
Looks good. 👍
I reviewed this by checking out the branch locally and then diffing with main. Only 5 files are changed:
>git diff main --name-only
.github/workflows/validate-markdown.yaml
package-lock.json
package.json
scripts/format-markdown.sh
versions/3.0.4.md
Changes to versions/3.04.md are what we want. I checked the diffs of the other files and all look right.
|
Same question here- why are we doing this when we're about to merge in the other direction? |
|
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
approved these changes
Sep 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges current
mainintov3.0.4-dev, resolving the two merge conflicts in