From 5037ca2d74ce754d1eb19740a7628c942b34de78 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Fri, 3 Apr 2026 07:57:36 -0500 Subject: [PATCH 1/2] WIP: Point clang-format-linter at composite-action branch --- .github/workflows/build-test-package.yml | 21 +++++---------------- .github/workflows/clang-format-linter.yml | 2 +- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index f265ba0..71bc8db 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -1,20 +1,9 @@ name: Build, test, package -on: - push: - branches: - - main - tags: - - 'v*' - pull_request: - branches: - - main +on: [push,pull_request] jobs: - cxx-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@main - - python-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@main - secrets: - pypi_password: ${{ secrets.pypi_password }} + placeholder: + runs-on: ubuntu-latest + steps: + - run: echo "Build disabled for WIP clang-format linter test" diff --git a/.github/workflows/clang-format-linter.yml b/.github/workflows/clang-format-linter.yml index 7d1df4f..4ab6e6b 100644 --- a/.github/workflows/clang-format-linter.yml +++ b/.github/workflows/clang-format-linter.yml @@ -9,6 +9,6 @@ jobs: steps: - uses: actions/checkout@v5 - - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@main + - uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@composite-action with: itk-branch: main From e51f7adb85b31609cb538c558878adc3ca723985 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Fri, 3 Apr 2026 07:57:54 -0500 Subject: [PATCH 2/2] WIP: Introduce deliberate clang-format violation (expect FAIL) Add badly formatted code to test that the composite clang-format linter correctly detects and reports style violations. See: https://github.com/InsightSoftwareConsortium/ITKClangFormatLinterAction/pull/23 --- include/itkCuberilleImageToMeshFilter.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/itkCuberilleImageToMeshFilter.h b/include/itkCuberilleImageToMeshFilter.h index 964df99..8d0e07c 100644 --- a/include/itkCuberilleImageToMeshFilter.h +++ b/include/itkCuberilleImageToMeshFilter.h @@ -27,6 +27,8 @@ #include "itkMacro.h" #include "itkMesh.h" #include "itkImageToMeshFilter.h" +// clang-format violation: bad indentation and spacing + int deliberately_bad_format = 42 ; #include "itkCellInterface.h" #include "itkTriangleCell.h" #include "itkQuadrilateralCell.h"