From 6858862aec009576e0c3671a62506516543b11bd Mon Sep 17 00:00:00 2001 From: Scott Hart Date: Sun, 20 Sep 2026 12:17:47 -0400 Subject: [PATCH 1/2] ci(gha): add vcpkg opentelemetry overlay to codeql workflow --- .github/workflows/codeql-analysis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5a05756305043..b7c15eec84acd 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -46,7 +46,7 @@ jobs: ~/.cache/vcpkg ~/.ccache key: | - codeql-analysis-6-${{ hashFiles('vcpkg.json') }}-${{ hashFiles('build/vcpkg/versions/baseline.json') }} + codeql-analysis-7-${{ hashFiles('vcpkg.json') }}-${{ hashFiles('ci/gha/builds/vcpkg-overlays/**') }}-${{ hashFiles('build/vcpkg/versions/baseline.json') }} restore-keys: | codeql-analysis- - name: install tools @@ -68,6 +68,7 @@ jobs: run: > build/vcpkg/vcpkg install \ --x-manifest-root . \ + --overlay-ports ci/gha/builds/vcpkg-overlays \ --feature-flags=versions \ --clean-after-build @@ -87,6 +88,7 @@ jobs: run: > cmake -GNinja -S . -B build/output \ -DCMAKE_TOOLCHAIN_FILE=build/vcpkg/scripts/buildsystems/vcpkg.cmake \ + -DVCPKG_OVERLAY_PORTS=ci/gha/builds/vcpkg-overlays \ -DBUILD_TESTING=OFF \ -DGOOGLE_CLOUD_CPP_ENABLE_CCACHE=OFF && \ cmake --build build/output From 8ab5424fcddd50a9fb0d478b0806c2e7b45e1cbd Mon Sep 17 00:00:00 2001 From: Scott Hart Date: Mon, 21 Sep 2026 18:42:49 -0400 Subject: [PATCH 2/2] make zizmor happy --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b7c15eec84acd..33d4e1738cd9f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -73,7 +73,7 @@ jobs: --clean-after-build - name: Initialize CodeQL - uses: github/codeql-action/init@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4 + uses: github/codeql-action/init@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4 with: languages: ${{ matrix.language }} @@ -94,4 +94,4 @@ jobs: cmake --build build/output - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4 + uses: github/codeql-action/analyze@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4