From e7d90d22665dce9c318376a012193cd302e973b7 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 7 Nov 2025 15:22:29 -0800 Subject: [PATCH 1/3] [GitHub][CI] Fix tooling container names These were accidentally changed in e0822202a8ce5134289a2487876f453521997def. --- .github/workflows/build-ci-container-tooling.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-ci-container-tooling.yml b/.github/workflows/build-ci-container-tooling.yml index 0bb8242eb35a9..f1da9dfd01d84 100644 --- a/.github/workflows/build-ci-container-tooling.yml +++ b/.github/workflows/build-ci-container-tooling.yml @@ -32,9 +32,9 @@ jobs: fail-fast: false matrix: include: - - container-name: code-format + - container-name: format test-command: 'cd $HOME && clang-format --version | grep version && git-clang-format -h | grep usage && black --version | grep black' - - container-name: code-lint + - container-name: lint test-command: 'cd $HOME && clang-tidy --version | grep version && clang-tidy-diff.py -h | grep usage' steps: - name: Checkout LLVM From 96b0d96fd0f58001d21633a889065225d30c476a Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 7 Nov 2025 15:34:37 -0800 Subject: [PATCH 2/3] Fix target name --- .github/workflows/build-ci-container-tooling.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-ci-container-tooling.yml b/.github/workflows/build-ci-container-tooling.yml index f1da9dfd01d84..4497333373fc1 100644 --- a/.github/workflows/build-ci-container-tooling.yml +++ b/.github/workflows/build-ci-container-tooling.yml @@ -33,8 +33,10 @@ jobs: matrix: include: - container-name: format + target: code-format test-command: 'cd $HOME && clang-format --version | grep version && git-clang-format -h | grep usage && black --version | grep black' - container-name: lint + target: code-lint test-command: 'cd $HOME && clang-tidy --version | grep version && clang-tidy-diff.py -h | grep usage' steps: - name: Checkout LLVM From 8744d97e3899fcde00b6a6821c726352b4aadd8d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 7 Nov 2025 15:38:59 -0800 Subject: [PATCH 3/3] Fix names --- .github/workflows/build-ci-container-tooling.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-ci-container-tooling.yml b/.github/workflows/build-ci-container-tooling.yml index 4497333373fc1..b94e373746447 100644 --- a/.github/workflows/build-ci-container-tooling.yml +++ b/.github/workflows/build-ci-container-tooling.yml @@ -33,10 +33,8 @@ jobs: matrix: include: - container-name: format - target: code-format test-command: 'cd $HOME && clang-format --version | grep version && git-clang-format -h | grep usage && black --version | grep black' - container-name: lint - target: code-lint test-command: 'cd $HOME && clang-tidy --version | grep version && clang-tidy-diff.py -h | grep usage' steps: - name: Checkout LLVM @@ -54,7 +52,7 @@ jobs: with: container-name: ci-ubuntu-24.04-${{ matrix.container-name }} dockerfile: .github/workflows/containers/github-action-ci-tooling/Dockerfile - target: ci-container-${{ matrix.container-name }} + target: ci-container-code-${{ matrix.container-name }} test-command: ${{ matrix.test-command }} push-ci-container: