Skip to content

merge main into staging#149

Merged
jeffcumpsty-tpx merged 8 commits intostagingfrom
main
Feb 26, 2026
Merged

merge main into staging#149
jeffcumpsty-tpx merged 8 commits intostagingfrom
main

Conversation

@jeffcumpsty-tpx
Copy link
Collaborator

No description provided.

jeffcumpsty-tpx and others added 8 commits February 13, 2026 10:26
* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity
* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* Sanitize URLs in logging for schema loading and error handling (#124)

* Update staging-to-main workflow to allow dependabot merges and modify .gitignore to include log files (#132)

* Update .gitignore to ignore all log files in the logs directory (#134)
Bumps the github-actions-updates group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action).


Updates `github/codeql-action` from 4.32.2 to 4.32.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v4.32.2...v4.32.3)

Updates `aquasecurity/trivy-action` from 0.33.1 to 0.34.0
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](aquasecurity/trivy-action@0.33.1...0.34.0)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.32.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions-updates
- dependency-name: aquasecurity/trivy-action
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* Sanitize URLs in logging for schema loading and error handling (#124)

* Update staging-to-main workflow to allow dependabot merges and modify .gitignore to include log files (#132)

* Update .gitignore to ignore all log files in the logs directory (#134)

* Jeffcumpsty tpx patch 1 (#135)

* Staging (#118)

* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* Staging (#125)

* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* Sanitize URLs in logging for schema loading and error handling (#124)

* Update staging-to-main workflow to allow dependabot merges and modify .gitignore to include log files (#132)

* Update .gitignore to ignore all log files in the logs directory (#134)

* Enhance error message for non-staging merges

Added echo statement to display current actor during merge error.

* chore: Bump Swashbuckle.AspNetCore from 10.1.2 to 10.1.3 (#131)

* Staging (#118)

* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* chore: Bump Swashbuckle.AspNetCore from 10.1.2 to 10.1.3

---
updated-dependencies:
- dependency-name: Swashbuckle.AspNetCore
  dependency-version: 10.1.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

* Staging (#125)

* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* Sanitize URLs in logging for schema loading and error handling (#124)

* Update staging-to-main workflow to allow dependabot merges and modify .gitignore to include log files (#132)

* Update .gitignore to ignore all log files in the logs directory (#134)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jeff Cumpsty <jeff.cumpsty@tpximpact.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: Bump Serilog.Sinks.File from 6.0.0 to 7.0.0 (#130)

* Staging (#118)

* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* chore: Bump Serilog.Sinks.File from 6.0.0 to 7.0.0

---
updated-dependencies:
- dependency-name: Serilog.Sinks.File
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jeff Cumpsty <jeff.cumpsty@tpximpact.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: Bump Serilog.AspNetCore and Serilog.Sinks.File (#129)

* Staging (#118)

* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* chore: Bump Serilog.AspNetCore and Serilog.Sinks.File

Bumps Serilog.AspNetCore from 8.0.3 to 10.0.0
Bumps Serilog.Sinks.File from 6.0.0 to 7.0.0

---
updated-dependencies:
- dependency-name: Serilog.AspNetCore
  dependency-version: 10.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: Serilog.Sinks.File
  dependency-version: 7.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jeff Cumpsty <jeff.cumpsty@tpximpact.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: Bump the testing-packages group with 1 update (#128)

* Staging (#118)

* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* chore: Bump the testing-packages group with 1 update

Bumps coverlet.collector from 6.0.4 to 8.0.0

---
updated-dependencies:
- dependency-name: coverlet.collector
  dependency-version: 8.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: testing-packages
...

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

* Staging (#125)

* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* Sanitize URLs in logging for schema loading and error handling (#124)

* Update staging-to-main workflow to allow dependabot merges and modify .gitignore to include log files (#132)

* Update .gitignore to ignore all log files in the logs directory (#134)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jeff Cumpsty <jeff.cumpsty@tpximpact.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update .gitignore to ignore all log files in the logs directory (#136)

* chore: Bump the microsoft-packages group with 1 update (#127)

* Staging (#118)

* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* chore: Bump the microsoft-packages group with 1 update

Bumps System.IdentityModel.Tokens.Jwt from 8.15.0 to 8.16.0

---
updated-dependencies:
- dependency-name: System.IdentityModel.Tokens.Jwt
  dependency-version: 8.16.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: microsoft-packages
...

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

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Jeff Cumpsty <jeff.cumpsty@tpximpact.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Merge maion to staging (#139)

* Staging (#118)

* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* Staging (#125)

* Update permissions in deploy.yml to allow writing for GitHub releases

* Add job name to staging-to-main workflow for clarity

* Sanitize URLs in logging for schema loading and error handling (#124)

* Update staging-to-main workflow to allow dependabot merges and modify .gitignore to include log files (#132)

* Update .gitignore to ignore all log files in the logs directory (#134)

* ci: bump the github-actions-updates group with 2 updates (#126)

Bumps the github-actions-updates group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action).


Updates `github/codeql-action` from 4.32.2 to 4.32.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v4.32.2...v4.32.3)

Updates `aquasecurity/trivy-action` from 0.33.1 to 0.34.0
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](aquasecurity/trivy-action@0.33.1...0.34.0)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.32.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions-updates
- dependency-name: aquasecurity/trivy-action
  dependency-version: 0.34.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the github-actions-updates group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action).


Updates `github/codeql-action` from 4.32.3 to 4.32.4
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v4.32.3...v4.32.4)

Updates `aquasecurity/trivy-action` from 0.34.0 to 0.34.1
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](aquasecurity/trivy-action@0.34.0...0.34.1)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.32.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions-updates
- dependency-name: aquasecurity/trivy-action
  dependency-version: 0.34.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions-updates
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps Microsoft.NET.Test.Sdk from 18.0.1 to 18.3.0

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-version: 18.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: microsoft-packages
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
updated-dependencies:
- dependency-name: JsonSchema.Net
  dependency-version: 9.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
updated-dependencies:
- dependency-name: Swashbuckle.AspNetCore
  dependency-version: 10.1.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jeffcumpsty-tpx jeffcumpsty-tpx merged commit a94e199 into staging Feb 26, 2026
14 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant