From e1be25b4e83cfc6a52d4a6e5b52a0b0acc384a05 Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Tue, 18 Mar 2025 14:26:49 -0500 Subject: [PATCH 1/2] Testing workflow --- .github/workflows/clang-format-checker.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/clang-format-checker.yml b/.github/workflows/clang-format-checker.yml index 1c69d6de86..d1887e4519 100644 --- a/.github/workflows/clang-format-checker.yml +++ b/.github/workflows/clang-format-checker.yml @@ -13,9 +13,16 @@ jobs: pull-requests: write steps: - name: Fetch LLVM sources - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: - fetch-depth: 2 + ref: ${{ github.event.pull_request.head.sha }} + + - name: Checkout through merge base + uses: rmacklin/fetch-through-merge-base@bfe4d03a86f9afa52bc1a70e9814fc92a07f7b75 # v0.3.0 + with: + base_ref: ${{ github.event.pull_request.base.ref }} + head_ref: ${{ github.event.pull_request.head.sha }} + deepen_length: 500 - name: Get changed files id: changed-files From 85c6ecba56049a6b5dc529064de99ba8420de7ed Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Tue, 18 Mar 2025 14:27:32 -0500 Subject: [PATCH 2/2] Bad formatting --- tools/clang/unittests/DxrFallback/ShaderTesterImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/clang/unittests/DxrFallback/ShaderTesterImpl.cpp b/tools/clang/unittests/DxrFallback/ShaderTesterImpl.cpp index 08ae2c3c75..ff95602ef5 100644 --- a/tools/clang/unittests/DxrFallback/ShaderTesterImpl.cpp +++ b/tools/clang/unittests/DxrFallback/ShaderTesterImpl.cpp @@ -363,7 +363,7 @@ void ShaderTesterImpl::initPipeline() { std::vector computeShaderBuffer; ComPtr computeShaderBlob; if (m_blob) { - bytecode = CD3DX12_SHADER_BYTECODE(m_blob.Get()); +bytecode = CD3DX12_SHADER_BYTECODE(m_blob.Get()); } else if (m_filename.find(L".cso") != std::wstring::npos) { ReadFileToBuffer(m_filename, computeShaderBuffer); bytecode = CD3DX12_SHADER_BYTECODE(computeShaderBuffer.data(), @@ -547,4 +547,4 @@ void ShaderTesterImpl::printLog(int *log) { for (int i = 0; i < count; ++i) std::cout << pos[i] << " "; std::cout << "\n"; -} \ No newline at end of file +}