From 5ce916bd0a9b3e34850f4543f9fd69d204990da6 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Mon, 31 Oct 2022 19:33:41 -0700
Subject: !fixup! Correct CodeQL3000 setup (#44809)

- add tag only when CodeQL3000 tasks did useful work
  - ignore no-op task executions
- correct tsaoptions.json location
---
 .azure/pipelines/ci.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index fba8950073..51f266471a 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -177,14 +177,18 @@ stages:
         # Ignore the small amount of infrastructure Python code in this repo.
         - Codeql.Language: cpp,csharp,java,javascript
         - Codeql.ExcludePathPatterns: submodules
+        # Ignore test and infrastructure code.
         - Codeql.SourceRoot: src
         # CodeQL3000 needs this plumbed along as a variable to enable TSA.
         - Codeql.TSAEnabled: ${{ eq(variables['Build.Reason'], 'Schedule') }}
+        # Default expects tsaoptions.json under SourceRoot.
+        - Codeql.TSAOptionsPath: '$(Build.SourcesDirectory)/.config/tsaoptions.json'
         beforeBuild:
-        - script: "echo ##vso[build.addbuildtag]CodeQL3000"
-          displayName: 'Set CI CodeQL3000 tag'
         - task: CodeQL3000Init@0
           displayName: CodeQL Initialize
+        - script: "echo ##vso[build.addbuildtag]CodeQL3000"
+          displayName: 'Set CI CodeQL3000 tag'
+          condition: ne(variables.CODEQL_DIST,'')
         steps:
         - script: ./eng/build.cmd
                   -ci
-- 
cgit v1.2.3