Skip to content

Sync develop to main (template workflow alignment) - #376

Merged
ptr727 merged 10 commits into
mainfrom
sync-develop-to-main
May 24, 2026
Merged

Sync develop to main (template workflow alignment)#376
ptr727 merged 10 commits into
mainfrom
sync-develop-to-main

Conversation

@ptr727

@ptr727 ptr727 commented May 24, 2026

Copy link
Copy Markdown
Owner

Summary

Replaces #375 (which had textual conflicts in the two wholesale-replaced workflow files). This branch is a merge-commit of `main` into a sync branch off `develop`, with conflicts resolved by keeping develop's template-aligned versions of:

  • `.github/workflows/merge-bot-pull-request.yml`
  • `.github/workflows/run-codegen-pull-request-task.yml`

All other files (CreateMatrix project bumps, version data, codegen output) merged cleanly.

What's landing on main

10 commits total: 8 already on main (re-applied via the merge), plus develop's two:

Visible behavior changes for main

  • Dependabot now targets main for nuget, github-actions, AND docker (docker is new) with dual-target shape across main + develop.
  • GitHub App token (`CODEGEN_APP_CLIENT_ID` + `CODEGEN_APP_PRIVATE_KEY`) on `actions/create-github-app-token@v3.2.0` replaces the `WORKFLOW_PAT` close/reopen workaround. App-token pushes fire downstream `pull_request` events natively.
  • Three-job merge-bot with maintainer-push safeguard (auto-disables auto-merge on a bot PR when a maintainer commits to the branch).
  • Method dispatch by base ref: `--squash` on develop, `--merge` on main. Enforced upstream by the new per-branch rulesets.

Last manual sync of its kind

Going forward, the dual-target bots open parallel PRs against both branches, so main no longer accumulates content develop is missing. The branch-protection setup explicitly forbids main → develop back-merges (develop's squash-only + linear ruleset blocks merge commits on develop).

Test plan

  • Once merged, post-merge push to main fires `publish-release.yml` automatically (validates App-token recursion-guard fix on main).
  • Next daily Dependabot cycle: parallel main + develop PRs per ecosystem group (nuget-deps, actions-deps, docker-deps).
  • Next weekly codegen run: parallel `codegen-main` → main and `codegen-develop` → develop PRs, each auto-merging with the correct method.

ptr727 and others added 10 commits March 31, 2026 11:10
* Develop (#356)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Signcommits (#331)

* Develop (#329)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Bump the nuget-deps group with 4 updates (#330)

Bumps csharpier from 1.2.5 to 1.2.6
Bumps Microsoft.Extensions.Http.Resilience from 10.2.0 to 10.3.0
Bumps Serilog from 4.3.0 to 4.3.1
Bumps System.CommandLine from 2.0.2 to 2.0.3

---
updated-dependencies:
- dependency-name: csharpier
  dependency-version: 1.2.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: Microsoft.Extensions.Http.Resilience
  dependency-version: 10.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-deps
- dependency-name: Serilog
  dependency-version: 4.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: System.CommandLine
  dependency-version: 2.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
...

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

* feat: enable signing of commits in codegen pull request workflow

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

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

* Noenv (#335)

* Develop (#333)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Signcommits (#331)

* Develop (#329)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Bump the nuget-deps group with 4 updates (#330)

Bumps csharpier from 1.2.5 to 1.2.6
Bumps Microsoft.Extensions.Http.Resilience from 10.2.0 to 10.3.0
Bumps Serilog from 4.3.0 to 4.3.1
Bumps System.CommandLine from 2.0.2 to 2.0.3

---
updated-dependencies:
- dependency-name: csharpier
  dependency-version: 1.2.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: Microsoft.Extensions.Http.Resilience
  dependency-version: 10.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-deps
- dependency-name: Serilog
  dependency-version: 4.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: System.CommandLine
  dependency-version: 2.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
...

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

* feat: enable signing of commits in codegen pull request workflow

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@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: Pieter Viljoen <ptr727@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix indentation in codegen step command

---------

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

* Indentation (#337)

* Develop (#336)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Signcommits (#331)

* Develop (#329)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Bump the nuget-deps group with 4 updates (#330)

Bumps csharpier from 1.2.5 to 1.2.6
Bumps Microsoft.Extensions.Http.Resilience from 10.2.0 to 10.3.0
Bumps Serilog from 4.3.0 to 4.3.1
Bumps System.CommandLine from 2.0.2 to 2.0.3

---
updated-dependencies:
- dependency-name: csharpier
  dependency-version: 1.2.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: Microsoft.Extensions.Http.Resilience
  dependency-version: 10.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-deps
- dependency-name: Serilog
  dependency-version: 4.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: System.CommandLine
  dependency-version: 2.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
...

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

* feat: enable signing of commits in codegen pull request workflow

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

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

* Noenv (#335)

* Develop (#333)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Signcommits (#331)

* Develop (#329)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Bump the nuget-deps group with 4 updates (#330)

Bumps csharpier from 1.2.5 to 1.2.6
Bumps Microsoft.Extensions.Http.Resilience from 10.2.0 to 10.3.0
Bumps Serilog from 4.3.0 to 4.3.1
Bumps System.CommandLine from 2.0.2 to 2.0.3

---
updated-dependencies:
- dependency-name: csharpier
  dependency-version: 1.2.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: Microsoft.Extensions.Http.Resilience
  dependency-version: 10.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-deps
- dependency-name: Serilog
  dependency-version: 4.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: System.CommandLine
  dependency-version: 2.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
...

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

* feat: enable signing of commits in codegen pull request workflow

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@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: Pieter Viljoen <ptr727@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix indentation in codegen step command

---------

Signed-off-by: Pieter Viljoen <ptr727@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: Pieter Viljoen <ptr727@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update codegen step in workflow and add codegen to workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

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

* Update pull request action to include 'codegen-update' branch (#342)

* Develop (#338)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Signcommits (#331)

* Develop (#329)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Bump the nuget-deps group with 4 updates (#330)

Bumps csharpier from 1.2.5 to 1.2.6
Bumps Microsoft.Extensions.Http.Resilience from 10.2.0 to 10.3.0
Bumps Serilog from 4.3.0 to 4.3.1
Bumps System.CommandLine from 2.0.2 to 2.0.3

---
updated-dependencies:
- dependency-name: csharpier
  dependency-version: 1.2.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: Microsoft.Extensions.Http.Resilience
  dependency-version: 10.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-deps
- dependency-name: Serilog
  dependency-version: 4.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: System.CommandLine
  dependency-version: 2.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
...

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

* feat: enable signing of commits in codegen pull request workflow

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

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

* Noenv (#335)

* Develop (#333)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Signcommits (#331)

* Develop (#329)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Bump the nuget-deps group with 4 updates (#330)

Bumps csharpier from 1.2.5 to 1.2.6
Bumps Microsoft.Extensions.Http.Resilience from 10.2.0 to 10.3.0
Bumps Serilog from 4.3.0 to 4.3.1
Bumps System.CommandLine from 2.0.2 to 2.0.3

---
updated-dependencies:
- dependency-name: csharpier
  dependency-version: 1.2.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: Microsoft.Extensions.Http.Resilience
  dependency-version: 10.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-deps
- dependency-name: Serilog
  dependency-version: 4.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: System.CommandLine
  dependency-version: 2.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
...

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

* feat: enable signing of commits in codegen pull request workflow

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@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: Pieter Viljoen <ptr727@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix indentation in codegen step command

---------

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

* Indentation (#337)

* Develop (#336)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Signcommits (#331)

* Develop (#329)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Bump the nuget-deps group with 4 updates (#330)

Bumps csharpier from 1.2.5 to 1.2.6
Bumps Microsoft.Extensions.Http.Resilience from 10.2.0 to 10.3.0
Bumps Serilog from 4.3.0 to 4.3.1
Bumps System.CommandLine from 2.0.2 to 2.0.3

---
updated-dependencies:
- dependency-name: csharpier
  dependency-version: 1.2.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: Microsoft.Extensions.Http.Resilience
  dependency-version: 10.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-deps
- dependency-name: Serilog
  dependency-version: 4.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: System.CommandLine
  dependency-version: 2.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
...

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

* feat: enable signing of commits in codegen pull request workflow

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

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

* Noenv (#335)

* Develop (#333)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Signcommits (#331)

* Develop (#329)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Bump the nuget-deps group with 4 updates (#330)

Bumps csharpier from 1.2.5 to 1.2.6
Bumps Microsoft.Extensions.Http.Resilience from 10.2.0 to 10.3.0
Bumps Serilog from 4.3.0 to 4.3.1
Bumps System.CommandLine from 2.0.2 to 2.0.3

---
updated-dependencies:
- dependency-name: csharpier
  dependency-version: 1.2.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: Microsoft.Extensions.Http.Resilience
  dependency-version: 10.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-deps
- dependency-name: Serilog
  dependency-version: 4.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: System.CommandLine
  dependency-version: 2.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
...

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

* feat: enable signing of commits in codegen pull request workflow

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@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: Pieter Viljoen <ptr727@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix indentation in codegen step command

---------

Signed-off-by: Pieter Viljoen <ptr727@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: Pieter Viljoen <ptr727@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update codegen step in workflow and add codegen to workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@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: Pieter Viljoen <ptr727@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump the nuget-deps group with 1 update (#339)

Bumps dotnet-outdated-tool from 4.6.9 to 4.7.0

---
updated-dependencies:
- dependency-name: dotnet-outdated-tool
  dependency-version: 4.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-deps
...

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

* Bump the nuget-deps group with 1 update (#340)

Bumps AwesomeAssertions from 9.3.0 to 9.4.0

---
updated-dependencies:
- dependency-name: AwesomeAssertions
  dependency-version: 9.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-deps
...

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

* Update pull request action to include 'codegen-update' branch

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

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

* Update WisenetWAVE and NxGo to version 6.1.1.42624 with corresponding download URLs (#353)

* Testcgpr (#343)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Signcommits (#331)

* Develop (#329)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Bump the nuget-deps group with 4 updates (#330)

Bumps csharpier from 1.2.5 to 1.2.6
Bumps Microsoft.Extensions.Http.Resilience from 10.2.0 to 10.3.0
Bumps Serilog from 4.3.0 to 4.3.1
Bumps System.CommandLine from 2.0.2 to 2.0.3

---
updated-dependencies:
- dependency-name: csharpier
  dependency-version: 1.2.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: Microsoft.Extensions.Http.Resilience
  dependency-version: 10.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: nuget-deps
- dependency-name: Serilog
  dependency-version: 4.3.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
- dependency-name: System.CommandLine
  dependency-version: 2.0.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: nuget-deps
...

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

* feat: enable signing of commits in codegen pull request workflow

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

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

* Noenv (#335)

* Develop (#333)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* just squash

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Signcommits (#331)

* Develop (#329)

* Enhance Docker build caching and update documentation (#324)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix syntax in jq command for generating docker hub repositories (#320)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update cache-to logic in Docker build step for feature branches (#321)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* fix: Add cache_tag to base image definitions for improved caching in Docker builds

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squashmerge (#328)

* Enhance Docker build caching and update documentation (#324) (#325)

* Develop (#319)

* Update docker hub readme task and fix version in README (#316)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings (#318)

* Update docker hub readme task and fix version in README (#316) (#317)



* Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings



---------



---------



* Fix syntax in jq command for generating docker hub repositories (#320)



* Update cache-to logic in Docker build step for feature branches (#321)



* fix: Add cache_tag to base image definitions for improved caching in Docker builds



---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Squash merge

Signed-off-by: Pieter Viljoen <ptr727@users.norepl…
…359)

* Add required secret for workflow token in codegen pull request task

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Update codegen branch references in workflow files

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Add .Net Outdated Upgrade task to tasks.json

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
…kflow (#361)

* Remove unnecessary condition for merging codegen pull requests in workflow

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix JSON formatting in tasks.json by correcting array indentation

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Add label to codegen pull request for automated processing

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
… steps (#362)

* Refine merge conditions for codegen pull requests and update workflow steps

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Fix condition for merging codegen pull requests to use github.actor

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

* Add pull request types to trigger merge bot action

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>

---------

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
…ns in workflow (#365)

Signed-off-by: Pieter Viljoen <ptr727@users.noreply.github.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Add documentation comment for WORKFLOW_PAT secret
- Refactor merge-codegen if condition to multi-line for readability
- Replace hard-coded 'ptr727' with github.repository_owner

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
## Summary

Brings the bot-PR / merge / dependency workflows in line with
[ptr727/ProjectTemplate](https://github.com/ptr727/ProjectTemplate). Two
visible behavior changes for derived repos:

1. **Merge methods split per branch** — `--squash` on develop (kept
linear), `--merge` on main (preserves develop's commit list as a real
second parent). Dispatched by a `case` on `pull_request.base.ref` in the
merge-bot.
2. **Codegen PRs use a GitHub App installation token** instead of the
close/reopen workaround. App-token pushes fire downstream `pull_request`
workflow events natively; the `WORKFLOW_PAT` secret and the `gh pr close
&& gh pr reopen` dance are gone.

### File changes

- `.github/dependabot.yml` — 6 entries: nuget × {main, develop},
github-actions × {main, develop}, docker × {main, develop} (new — covers
all 13 `Docker/*.Dockerfile`s).
- `.github/workflows/merge-bot-pull-request.yml` — copied wholesale from
template. Three jobs (`merge-dependabot`, `merge-codegen`,
`disable-auto-merge-on-maintainer-push`), `cancel-in-progress: false`
(load-bearing for the three-job model), App-token via
`actions/create-github-app-token` SHA-pinned to v1.12.0, head/base
pairing enforced on codegen, bot login `ptr727-codegen[bot]`.
- `.github/workflows/run-codegen-pull-request-task.yml` — matrix over
main + develop with branches `codegen-main` / `codegen-develop`,
App-token, no close/reopen, NxWitness-specific bits preserved
(`CreateMatrix.csproj` codegen command, `dotnet husky install`, no
`NINJA_API_KEY`).
- `.github/workflows/test-pull-request.yml` — branches list updated to
`[ main, develop, codegen-main, codegen-develop ]`.

### Already applied out-of-band

- **Branch rulesets**: old combined "Main and Develop" ruleset removed;
new "Develop branch" (squash + linear) and "Main branch" (merge-only)
rulesets in place, exported from template. Both have strict
status-checks policy off (intentional — see template's AGENTS.md
"Branching Model").
- **Secrets**: `CODEGEN_APP_CLIENT_ID` + `CODEGEN_APP_PRIVATE_KEY` exist
in Actions and Dependabot contexts; `WORKFLOW_PAT` deleted.
- **Repo settings**: merge-commit enabled at the repo level (squash
already was). Rebase remains off.

### Note on secret naming

Workflows reference `CODEGEN_APP_CLIENT_ID` (Client ID), not the
template's `CODEGEN_APP_ID` (numeric App ID). Both work with
`actions/create-github-app-token`, but the template's `app-id` input is
[deprecated](ptr727/ProjectTemplate#88) in
newer versions of the action in favor of `client-id`. NxWitness adopts
the modern naming directly. Template issue filed to bring the upstream
in line.

## Test plan

- [ ] Trigger codegen via `gh workflow run
run-periodic-codegen-pull-request.yml`; expect two PRs (codegen-main →
main, codegen-develop → develop), both authored by
`ptr727-codegen[bot]`, no close/reopen timeline events.
- [ ] `gh pr view <N> --json autoMergeRequest` shows `mergeMethod:
MERGE` on main-targeted PR and `mergeMethod: SQUASH` on develop-targeted
PR.
- [ ] After CI passes, both auto-merge; merge commits attributed to the
App identity. Resulting push to main/develop fires `publish-release.yml`
automatically (validates the recursion-guard fix).
- [ ] Push a maintainer commit to a bot PR branch while auto-merge is
on; `disable-auto-merge-on-maintainer-push` runs and `autoMergeRequest`
becomes null.
- [ ] Next daily Dependabot cycle: parallel PRs against main and develop
for each group (`nuget-deps`, `actions-deps`, `docker-deps`).
Semver-major NuGet stays open without auto-merge.
Brings main's accumulated codegen/dependabot/dependency-bump commits
(PRs #366..#373) onto a sync branch so develop's CI workflow rewrite
can land on main as a clean merge. Conflicts in the two wholesale-
replaced workflow files were resolved by keeping develop's
template-aligned versions:

- .github/workflows/merge-bot-pull-request.yml
- .github/workflows/run-codegen-pull-request-task.yml

This branch exists solely to carry the resolved merge into main via
PR. It will be deleted after merge. The dual-target Dependabot and
codegen workflows on develop will absorb main's content drift going
forward, so this is the last manual sync of its kind.
Copilot AI review requested due to automatic review settings May 24, 2026 20:13

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Syncs develop-aligned CI automation onto main, bringing workflow behavior in line with the template’s GitHub App token and dual-branch bot strategy so codegen and dependency updates can land independently on both branches.

Changes:

  • Updates the codegen PR workflow to run a main/develop matrix and open codegen-main / codegen-develop PRs using a GitHub App installation token (removing the close/reopen PAT workaround).
  • Replaces the merge-bot workflow with a three-job model that (a) enables auto-merge for Dependabot/codegen on open/reopen, (b) chooses merge method by base branch, and (c) disables auto-merge when a maintainer pushes to a bot PR.
  • Expands Dependabot config to dual-target main + develop for NuGet, GitHub Actions, and Docker.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated no comments.

File Description
.github/workflows/test-pull-request.yml Limits PR test workflow branch filtering to main and develop.
.github/workflows/run-codegen-pull-request-task.yml Runs codegen for both branches and creates PRs using an App token (no PAT close/reopen).
.github/workflows/merge-bot-pull-request.yml Implements the template-aligned 3-job merge-bot model with per-branch merge method dispatch and maintainer-push auto-merge disable.
.github/dependabot.yml Configures Dependabot to open parallel PRs against both main and develop across ecosystems.

@ptr727
ptr727 merged commit da43600 into main May 24, 2026
52 checks passed
@ptr727
ptr727 deleted the sync-develop-to-main branch May 24, 2026 21:02
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.

2 participants