Merge branch 'main' into update-node-tool

microsoft · Jan 23, 2025 · e4751ea · e4751ea
2 parents 37deb64 + b7033b3
commit e4751ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.ado/jobs/nuget-publish.yml b/.ado/jobs/nuget-publish.yml
@@ -88,7 +88,9 @@ jobs:
     - job: ${{ slice.name }}
       displayName: 'Build ${{ slice.friendly_name }}'
       pool:
+        name: Azure Pipelines
         vmImage: $(vmImageApple)
+        os: macOS
       timeoutInMinutes: 90
       cancelTimeoutInMinutes: 5
       templateContext:

diff --git a/.ado/publish.yml b/.ado/publish.yml
@@ -17,6 +17,10 @@ variables:
   - group: InfoSec-SecurityResults
   - name: tags
     value: production,externalfacing
+  # CodeQL Still has not fixed their bug running on Apple ARM64 jobs where they inject x64 binaries into arm64 processes and just make it crash :(
+  # Only workaround for now is to disable CodeQL on Apple jobs.
+  - name Codeql.Enabled
+    value: false
   - template: /.ado/variables/vars.yml@self
 
 resources: