From cbbc75154371fd6b08d91d1ce6a8711d7d2afef0 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Thu, 5 Feb 2026 18:44:08 -0500 Subject: [PATCH 1/3] 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 * 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 * Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings Signed-off-by: Pieter Viljoen --------- Signed-off-by: Pieter Viljoen --------- Signed-off-by: Pieter Viljoen * Fix syntax in jq command for generating docker hub repositories (#320) Signed-off-by: Pieter Viljoen * Update cache-to logic in Docker build step for feature branches (#321) Signed-off-by: Pieter Viljoen * fix: Add cache_tag to base image definitions for improved caching in Docker builds Signed-off-by: Pieter Viljoen --------- Signed-off-by: Pieter Viljoen --- .github/workflows/build-base-images-task.yml | 24 +++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-base-images-task.yml b/.github/workflows/build-base-images-task.yml index c59ff42..9705c6e 100644 --- a/.github/workflows/build-base-images-task.yml +++ b/.github/workflows/build-base-images-task.yml @@ -17,14 +17,16 @@ jobs: strategy: matrix: base: - - name: nx-base - dockerfile: Docker/NxBase.Dockerfile - tags: | - docker.io/ptr727/nx-base:ubuntu-noble - - name: nx-base-lsio - dockerfile: Docker/NxBase-LSIO.Dockerfile - tags: | - docker.io/ptr727/nx-base-lsio:ubuntu-noble + - name: nx-base + dockerfile: Docker/NxBase.Dockerfile + cache_tag: docker.io/ptr727/nx-base:ubuntu-noble + tags: | + docker.io/ptr727/nx-base:ubuntu-noble + - name: nx-base-lsio + dockerfile: Docker/NxBase-LSIO.Dockerfile + cache_tag: docker.io/ptr727/nx-base-lsio:ubuntu-noble + tags: | + docker.io/ptr727/nx-base-lsio:ubuntu-noble steps: @@ -55,9 +57,9 @@ jobs: context: Docker file: ${{ matrix.base.dockerfile }} platforms: linux/amd64,linux/arm64 - tags: ${{ matrix.base.tags }} - cache-from: | - type=registry,ref=${{ matrix.base.tags }} + tags: ${{ matrix.base.tags }} + cache-from: | + type=registry,ref=${{ matrix.base.cache_tag }} type=gha,scope=develop-base-${{ matrix.base.name }} type=gha,scope=main-base-${{ matrix.base.name }} ${{ github.event.pull_request && format('type=gha,scope=pr-base-{0}-{1}', github.event.pull_request.number, matrix.base.name) || '' }} From a5f9d782d23d20933776d3a3d4e99cdc77e36e23 Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Wed, 11 Feb 2026 06:28:33 -0500 Subject: [PATCH 2/3] 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 * Squash merge Signed-off-by: Pieter Viljoen * just squash Signed-off-by: Pieter Viljoen --------- Signed-off-by: Pieter Viljoen --- .github/workflows/merge-bot-pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge-bot-pull-request.yml b/.github/workflows/merge-bot-pull-request.yml index 615ed52..e62689d 100644 --- a/.github/workflows/merge-bot-pull-request.yml +++ b/.github/workflows/merge-bot-pull-request.yml @@ -27,7 +27,7 @@ jobs: - name: Merge pull request step if: steps.metadata.outputs.update-type != 'version-update:semver-major' - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GH_TOKEN: ${{secrets.GITHUB_TOKEN}} @@ -43,7 +43,7 @@ jobs: steps: - name: Merge pull request step - run: gh pr merge --auto --merge "$PR_URL" + run: gh pr merge --auto --squash "$PR_URL" env: PR_URL: ${{github.event.pull_request.html_url}} GH_TOKEN: ${{secrets.GITHUB_TOKEN}} From 158c84ed47997a9e83b4292bd3a374a71682526a Mon Sep 17 00:00:00 2001 From: Pieter Viljoen Date: Thu, 12 Feb 2026 04:55:02 -0500 Subject: [PATCH 3/3] 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 * 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 * Update GitHub Copilot guidance, enhance Docker build caching, and modify workspace settings Signed-off-by: Pieter Viljoen --------- Signed-off-by: Pieter Viljoen --------- Signed-off-by: Pieter Viljoen * Fix syntax in jq command for generating docker hub repositories (#320) Signed-off-by: Pieter Viljoen * Update cache-to logic in Docker build step for feature branches (#321) Signed-off-by: Pieter Viljoen * fix: Add cache_tag to base image definitions for improved caching in Docker builds Signed-off-by: Pieter Viljoen --------- Signed-off-by: Pieter Viljoen * 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 * Squash merge Signed-off-by: Pieter Viljoen * just squash Signed-off-by: Pieter Viljoen --------- Signed-off-by: Pieter Viljoen --------- Signed-off-by: Pieter Viljoen * 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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pieter Viljoen * feat: enable signing of commits in codegen pull request workflow Signed-off-by: Pieter Viljoen --------- Signed-off-by: Pieter Viljoen Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .config/dotnet-tools.json | 4 ++-- .github/workflows/run-codegen-pull-request-task.yml | 1 + CreateMatrix/CreateMatrix.csproj | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a6dbde4..2f1a910 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "csharpier": { - "version": "1.2.5", + "version": "1.2.6", "commands": [ "csharpier" ], @@ -24,4 +24,4 @@ "rollForward": false } } -} +} \ No newline at end of file diff --git a/.github/workflows/run-codegen-pull-request-task.yml b/.github/workflows/run-codegen-pull-request-task.yml index 89fe1c7..fdefb94 100644 --- a/.github/workflows/run-codegen-pull-request-task.yml +++ b/.github/workflows/run-codegen-pull-request-task.yml @@ -39,3 +39,4 @@ jobs: body: 'This PR updates the codegen files.' commit-message: 'Update codegen files' delete-branch: true + sign-commits: true diff --git a/CreateMatrix/CreateMatrix.csproj b/CreateMatrix/CreateMatrix.csproj index 36849b5..83fb552 100644 --- a/CreateMatrix/CreateMatrix.csproj +++ b/CreateMatrix/CreateMatrix.csproj @@ -16,11 +16,11 @@ true - + - - + +