Skip to content
New issue

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

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

Already on GitHub? # to your account

v3.1-dev: update from dev and resolve conflicts #4374

Open
wants to merge 126 commits into
base: v3.1-dev
Choose a base branch
from

Conversation

ralfhandl
Copy link
Contributor

@ralfhandl ralfhandl commented Feb 20, 2025

This PR only updates the publishing infrastructure and does not modify the specification and schema files in the src folder.

It syncs the v3.1-dev branch with the dev branch. This is a follow-up to

We unfortunately changed files in v3.1-dev that should not have been changed, and this PR resolves the conflicts caused by

A corresponding PR trying to directly merge dev into v3.1-dev and failing due to these conflicts is

Tick one of the following options:

  • schema changes are included in this pull request
  • schema changes are needed for this pull request but not done yet
  • no schema changes are needed for this pull request

dependabot bot and others added 30 commits November 25, 2024 07:43
Bumps [markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli) from 0.42.0 to 0.43.0.
- [Release notes](https://github.com/igorshubovych/markdownlint-cli/releases)
- [Commits](igorshubovych/markdownlint-cli@v0.42.0...v0.43.0)

---
updated-dependencies:
- dependency-name: markdownlint-cli
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…lint-cli-0.43.0

Bump markdownlint-cli from 0.42.0 to 0.43.0
Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v2.1.6/packages/vitest)

---
updated-dependencies:
- dependency-name: vitest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 2.1.6 to 2.1.8.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v2.1.8/packages/vitest)

---
updated-dependencies:
- dependency-name: vitest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Ralf Handl <ralf.handl@sap.com>
Bumps [c8](https://github.com/bcoe/c8) from 10.1.2 to 10.1.3.
- [Release notes](https://github.com/bcoe/c8/releases)
- [Changelog](https://github.com/bcoe/c8/blob/main/CHANGELOG.md)
- [Commits](bcoe/c8@v10.1.2...v10.1.3)

---
updated-dependencies:
- dependency-name: c8
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Ralf Handl <ralf.handl@sap.com>
Contributing file updates, remove old development file
Bumps [highlight.js](https://github.com/highlightjs/highlight.js) from 11.10.0 to 11.11.0.
- [Release notes](https://github.com/highlightjs/highlight.js/releases)
- [Changelog](https://github.com/highlightjs/highlight.js/blob/main/CHANGES.md)
- [Commits](highlightjs/highlight.js@11.10.0...11.11.0)

---
updated-dependencies:
- dependency-name: highlight.js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…t.js-11.11.0

Bump highlight.js from 11.10.0 to 11.11.0
Bumps [respec](https://github.com/speced/respec) from 35.1.2 to 35.2.1.
- [Release notes](https://github.com/speced/respec/releases)
- [Changelog](https://github.com/speced/respec/blob/main/CHANGELOG.md)
- [Commits](speced/respec@v35.1.2...v35.2.1)

---
updated-dependencies:
- dependency-name: respec
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@ralfhandl ralfhandl marked this pull request as draft February 21, 2025 08:38
lornajane and others added 6 commits February 22, 2025 21:34
main: update style-guide.md - consistent style for field names and values in YAML comments
Configure deploydir based on branch name
Check branch name for conformance to vX.Y.Z structure
  * deploy to /deploy/oas/$version if branch name is conformant
  * deploy to /deploy-preview if branch name is non-conformant
Perform only one traversal of schemas structure
Remove intermediate data structures (datesHash, sedCmd)
@ralfhandl ralfhandl marked this pull request as ready for review February 25, 2025 08:00
dependabot bot and others added 2 commits February 25, 2025 08:01
Bumps [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) from 3.0.6 to 3.0.7.
- [Release notes](https://github.com/vitest-dev/vitest/releases)
- [Commits](https://github.com/vitest-dev/vitest/commits/v3.0.7/packages/vitest)

---
updated-dependencies:
- dependency-name: vitest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@ralfhandl ralfhandl mentioned this pull request Feb 25, 2025
5 tasks
@ralfhandl ralfhandl changed the title 3.1: update from dev branch v3.1-dev: update from dev branch and resolve conflicts Mar 1, 2025
@ralfhandl ralfhandl changed the title v3.1-dev: update from dev branch and resolve conflicts v3.1-dev: update from dev and resolve conflicts Mar 1, 2025
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants