Skip to content

Commit dd12d3b

Browse files
authored
Merge branch 'main' into dmehala/fix/sampling
2 parents 813490e + c714a42 commit dd12d3b

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
- run:
111111
name: Install dependencies
112112
command: |
113-
choco install -y cmake --installargs 'ADD_CMAKE_TO_PATH=System'
113+
choco install -y cmake --version=3.31.6 --installargs 'ADD_CMAKE_TO_PATH=System'
114114
choco install -y ninja
115115
- run:
116116
name: Building

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ jobs:
2929
with:
3030
languages: ${{ matrix.language }}
3131

32+
- name: Install dependencies
33+
run: bin/install-cmake
34+
3235
- name: Build dd-trace-cpp
33-
run: |
34-
bin/install-cmake
35-
bin/cmake-build
36+
run: bin/cmake-build --preset=ci-codeql
3637

3738
- name: Perform CodeQL Analysis
3839
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10

CMakePresets.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
"DD_TRACE_STATIC_CRT": "1",
1313
"DD_TRACE_BUILD_TESTING": "1"
1414
}
15+
},
16+
{
17+
"name": "ci-codeql",
18+
"displayName": "CI CodeQL",
19+
"cacheVariables": {
20+
"CMAKE_POLICY_VERSION_MINIMUM": "3.5"
21+
}
1522
}
1623
]
1724
}

0 commit comments

Comments
 (0)