Skip to content

Combined Dependabot PRs #233

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.

Sign up for GitHub

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

Jump to bottom
Merged
masl2 merged 29 commits into from
Nov 11, 2025
Merged

Combined Dependabot PRs #233

masl2 merged 29 commits into from
Nov 11, 2025

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Nov 10, 2025 •
edited by m-houston
Loading

Combined Dependabot PRs

✅ The following pull requests have been successfully combined on this PR:

This PR was created by the github/combine-prs action

Reverted:

dependabot bot and others added 20 commits October 30, 2025 03:14
@dependabot
Bump actions/download-artifact from 5 to 6
972cf97 
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5 to 6.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v5...v6)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump nhsuk-frontend from 8.3.0 to 10.1.0
980db85 
Bumps [nhsuk-frontend](https://github.com/nhsuk/nhsuk-frontend) from 8.3.0 to 10.1.0.
- [Release notes](https://github.com/nhsuk/nhsuk-frontend/releases)
- [Changelog](https://github.com/nhsuk/nhsuk-frontend/blob/main/CHANGELOG.md)
- [Commits](nhsuk/nhsuk-frontend@v8.3.0...v10.1.0)

---
updated-dependencies:
- dependency-name: nhsuk-frontend
  dependency-version: 10.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump typescript from 5.9.2 to 5.9.3
84210a8 
Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release-publish.yml)
- [Commits](microsoft/TypeScript@v5.9.2...v5.9.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump @openapitools/openapi-generator-cli from 2.23.4 to 2.25.0
85597fc 
Bumps [@openapitools/openapi-generator-cli](https://github.com/OpenAPITools/openapi-generator-cli) from 2.23.4 to 2.25.0.
- [Release notes](https://github.com/OpenAPITools/openapi-generator-cli/releases)
- [Changelog](https://github.com/OpenAPITools/openapi-generator-cli/blob/master/.releaserc)
- [Commits](OpenAPITools/openapi-generator-cli@v2.23.4...v2.25.0)

---
updated-dependencies:
- dependency-name: "@openapitools/openapi-generator-cli"
  dependency-version: 2.25.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump @redocly/cli from 1.34.5 to 2.8.0
6eb0500 
Bumps [@redocly/cli](https://github.com/Redocly/redocly-cli) from 1.34.5 to 2.8.0.
- [Release notes](https://github.com/Redocly/redocly-cli/releases)
- [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@1.34.5...@redocly/cli@2.8.0)

---
updated-dependencies:
- dependency-name: "@redocly/cli"
  dependency-version: 2.8.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump github/codeql-action from 4.31.0 to 4.31.2
217966c 
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.0 to 4.31.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@4e94bd1...0499de3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@github-actions
Merge dependabot/github_actions/github/codeql-action-4.31.2 into depe…
8d04529 
…ndabotCombined
@github-actions
Merge dependabot/npm_and_yarn/redocly/cli-2.8.0 into dependabotCombined
b394991
@github-actions
Merge dependabot/npm_and_yarn/typescript-5.9.3 into dependabotCombined
e32bd0c
@github-actions
Merge dependabot/npm_and_yarn/nhsuk-frontend-10.1.0 into dependabotCo…
5edf3f8 
…mbined
@timireland @masl2
Update .gitleaksignore
09b4c78 
added gitleaks ignore
@masl2
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/yargs-18…
56c5886 
….0.0' into dependabotCombined
@masl2
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/openapit…
f0ceb16 
…ools/openapi-generator-cli-2.25.0' into dependabotCombined
@masl2
Merge remote-tracking branch 'origin/dependabot/github_actions/action…
45a0936 
…s/download-artifact-6' into dependabotCombined
@masl2
update lock
b208482
@dependabot
Bump nhsuk-frontend from 8.3.0 to 10.1.0
b2f932c 
Bumps [nhsuk-frontend](https://github.com/nhsuk/nhsuk-frontend) from 8.3.0 to 10.1.0.
- [Release notes](https://github.com/nhsuk/nhsuk-frontend/releases)
- [Changelog](https://github.com/nhsuk/nhsuk-frontend/blob/main/CHANGELOG.md)
- [Commits](nhsuk/nhsuk-frontend@v8.3.0...v10.1.0)

---
updated-dependencies:
- dependency-name: nhsuk-frontend
  dependency-version: 10.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump @openapitools/openapi-generator-cli from 2.23.4 to 2.25.0
e7dd3d1 
Bumps [@openapitools/openapi-generator-cli](https://github.com/OpenAPITools/openapi-generator-cli) from 2.23.4 to 2.25.0.
- [Release notes](https://github.com/OpenAPITools/openapi-generator-cli/releases)
- [Changelog](https://github.com/OpenAPITools/openapi-generator-cli/blob/master/.releaserc)
- [Commits](OpenAPITools/openapi-generator-cli@v2.23.4...v2.25.0)

---
updated-dependencies:
- dependency-name: "@openapitools/openapi-generator-cli"
  dependency-version: 2.25.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump yargs from 17.7.2 to 18.0.0
3f83de1 
Bumps [yargs](https://github.com/yargs/yargs) from 17.7.2 to 18.0.0.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md)
- [Commits](yargs/yargs@v17.7.2...v18.0.0)

---
updated-dependencies:
- dependency-name: yargs
  dependency-version: 18.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump typescript from 5.9.2 to 5.9.3
e724b31 
Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release-publish.yml)
- [Commits](microsoft/TypeScript@v5.9.2...v5.9.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot
Bump @redocly/cli from 1.34.5 to 2.8.0
ab7ac18 
Bumps [@redocly/cli](https://github.com/Redocly/redocly-cli) from 1.34.5 to 2.8.0.
- [Release notes](https://github.com/Redocly/redocly-cli/releases)
- [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@1.34.5...@redocly/cli@2.8.0)

---
updated-dependencies:
- dependency-name: "@redocly/cli"
  dependency-version: 2.8.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@github-actions github-actions bot requested a review from a team as a code owner November 10, 2025 22:06
@github-actions github-actions bot added the dependencies Pull requests that update a dependency file label Nov 10, 2025
@github-actions github-actions bot requested a review from a team as a code owner November 10, 2025 22:06
@github-actions github-actions bot added the dependencies Pull requests that update a dependency file label Nov 10, 2025
@m-houston
Copy link
Contributor

m-houston commented Nov 11, 2025

Temporarily closing this PR to free up a proxy deployment

@m-houston m-houston closed this Nov 11, 2025
@m-houston
Copy link
Contributor

m-houston commented Nov 11, 2025

PR closed workflow was not triggered

@m-houston m-houston reopened this Nov 11, 2025
m-houston and others added 2 commits November 11, 2025 10:26
@m-houston
Merge branch 'main' into dependabotCombined
ae3b063 
# Conflicts:
#	.github/workflows/stage-5-publish.yaml
#	package-lock.json
#	package.json
@github-actions
Merge dependabot/npm_and_yarn/typescript-5.9.3 into dependabotCombined
e9eb2e2
@m-houston
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/redocly/…
decc365 
…cli-2.8.0' into dependabotCombined

# Conflicts:
#	package-lock.json
#	package.json
@m-houston
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/yargs-18…
534c5a2 
….0.0' into dependabotCombined

# Conflicts:
#	package-lock.json
@m-houston
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/openapit…
8e68a0a 
…ools/openapi-generator-cli-2.25.0' into dependabotCombined

# Conflicts:
#	package-lock.json
#	package.json
@m-houston
Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/nhsuk-fr…
57f7aab 
…ontend-10.1.0' into dependabotCombined
@m-houston
Update package-lock.json
d65ddd7
@m-houston
Merge remote-tracking branch 'origin/dependabotCombined' into dependa…
fec3ead 
…botCombined
@m-houston
Downgrade openapi gen and redocly
23a1733
nhsd-david-wass
nhsd-david-wass approved these changes Nov 11, 2025
View reviewed changes
Copy link
Contributor

@nhsd-david-wass nhsd-david-wass left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@masl2 masl2 merged commit c934c3c into main Nov 11, 2025
42 checks passed
@masl2 masl2 deleted the dependabotCombined branch November 11, 2025 13:24
masl2 added a commit that referenced this pull request Nov 14, 2025
@masl2
Revert "Combined Dependabot PRs (#233)"
31584cc 
This reverts commit c934c3c.
masl2 added a commit that referenced this pull request Jan 5, 2026
@github-actions @dependabot
@timireland @masl2 @m-houston
Combined Dependabot PRs (#233)
91f3c41 
* Bump actions/download-artifact from 5 to 6

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5 to 6.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v5...v6)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Bump nhsuk-frontend from 8.3.0 to 10.1.0

Bumps [nhsuk-frontend](https://github.com/nhsuk/nhsuk-frontend) from 8.3.0 to 10.1.0.
- [Release notes](https://github.com/nhsuk/nhsuk-frontend/releases)
- [Changelog](https://github.com/nhsuk/nhsuk-frontend/blob/main/CHANGELOG.md)
- [Commits](nhsuk/nhsuk-frontend@v8.3.0...v10.1.0)

---
updated-dependencies:
- dependency-name: nhsuk-frontend
  dependency-version: 10.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Bump typescript from 5.9.2 to 5.9.3

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release-publish.yml)
- [Commits](microsoft/TypeScript@v5.9.2...v5.9.3)

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

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

* Bump @openapitools/openapi-generator-cli from 2.23.4 to 2.25.0

Bumps [@openapitools/openapi-generator-cli](https://github.com/OpenAPITools/openapi-generator-cli) from 2.23.4 to 2.25.0.
- [Release notes](https://github.com/OpenAPITools/openapi-generator-cli/releases)
- [Changelog](https://github.com/OpenAPITools/openapi-generator-cli/blob/master/.releaserc)
- [Commits](OpenAPITools/openapi-generator-cli@v2.23.4...v2.25.0)

---
updated-dependencies:
- dependency-name: "@openapitools/openapi-generator-cli"
  dependency-version: 2.25.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

* Bump @redocly/cli from 1.34.5 to 2.8.0

Bumps [@redocly/cli](https://github.com/Redocly/redocly-cli) from 1.34.5 to 2.8.0.
- [Release notes](https://github.com/Redocly/redocly-cli/releases)
- [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@1.34.5...@redocly/cli@2.8.0)

---
updated-dependencies:
- dependency-name: "@redocly/cli"
  dependency-version: 2.8.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

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

* Bump github/codeql-action from 4.31.0 to 4.31.2

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.0 to 4.31.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@4e94bd1...0499de3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Update .gitleaksignore

added gitleaks ignore

* Merge remote-tracking branch 'origin/dependabot/npm_and_yarn/yargs-18.0.0' into dependabotCombined

* update lock

* Bump nhsuk-frontend from 8.3.0 to 10.1.0

Bumps [nhsuk-frontend](https://github.com/nhsuk/nhsuk-frontend) from 8.3.0 to 10.1.0.
- [Release notes](https://github.com/nhsuk/nhsuk-frontend/releases)
- [Changelog](https://github.com/nhsuk/nhsuk-frontend/blob/main/CHANGELOG.md)
- [Commits](nhsuk/nhsuk-frontend@v8.3.0...v10.1.0)

---
updated-dependencies:
- dependency-name: nhsuk-frontend
  dependency-version: 10.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Bump @openapitools/openapi-generator-cli from 2.23.4 to 2.25.0

Bumps [@openapitools/openapi-generator-cli](https://github.com/OpenAPITools/openapi-generator-cli) from 2.23.4 to 2.25.0.
- [Release notes](https://github.com/OpenAPITools/openapi-generator-cli/releases)
- [Changelog](https://github.com/OpenAPITools/openapi-generator-cli/blob/master/.releaserc)
- [Commits](OpenAPITools/openapi-generator-cli@v2.23.4...v2.25.0)

---
updated-dependencies:
- dependency-name: "@openapitools/openapi-generator-cli"
  dependency-version: 2.25.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

* Bump yargs from 17.7.2 to 18.0.0

Bumps [yargs](https://github.com/yargs/yargs) from 17.7.2 to 18.0.0.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md)
- [Commits](yargs/yargs@v17.7.2...v18.0.0)

---
updated-dependencies:
- dependency-name: yargs
  dependency-version: 18.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Bump typescript from 5.9.2 to 5.9.3

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.9.2 to 5.9.3.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release-publish.yml)
- [Commits](microsoft/TypeScript@v5.9.2...v5.9.3)

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

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

* Bump @redocly/cli from 1.34.5 to 2.8.0

Bumps [@redocly/cli](https://github.com/Redocly/redocly-cli) from 1.34.5 to 2.8.0.
- [Release notes](https://github.com/Redocly/redocly-cli/releases)
- [Commits](https://github.com/Redocly/redocly-cli/compare/@redocly/cli@1.34.5...@redocly/cli@2.8.0)

---
updated-dependencies:
- dependency-name: "@redocly/cli"
  dependency-version: 2.8.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

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

* Update package-lock.json

* Downgrade openapi gen and redocly

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tim Ireland <tim.ireland@hscic.gov.uk>
Co-authored-by: Mark Slowey <mark.slowey1@nhs.net>
Co-authored-by: Mike Houston <michael.houston4@nhs.net>
Signed-off-by: Mark Slowey <mark.slowey1@nhs.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nhsd-david-wass nhsd-david-wass nhsd-david-wass approved these changes

@masl2 masl2 masl2 approved these changes

Assignees

No one assigned

Labels

dependencies Pull requests that update a dependency file

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@m-houston @nhsd-david-wass @masl2 @timireland