Skip to content

Commit 3ae4854

Browse files
authored
Merge branch 'main' into dmehala/disable-tracing
2 parents 55684de + 31f263f commit 3ae4854

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2626

2727
- name: Initialize CodeQL
28-
uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
28+
uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
2929
with:
3030
languages: ${{ matrix.language }}
3131

@@ -36,4 +36,4 @@ jobs:
3636
run: bin/cmake-build --preset=ci-codeql
3737

3838
- name: Perform CodeQL Analysis
39-
uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
39+
uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2

.gitlab/benchmarks.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ benchmarks:
3030
UPSTREAM_BRANCH: $CI_COMMIT_REF_NAME # The branch or tag name for which project is built.
3131
UPSTREAM_COMMIT_SHA: $CI_COMMIT_SHA # The commit revision the project is built for.
3232

33-
KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-cpp
34-
FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: "true"
35-
3633
check-big-regressions:
3734
stage: benchmarks-report
3835
needs: [ benchmarks ]
@@ -50,5 +47,3 @@ check-big-regressions:
5047
export PATH="$PATH:/platform/steps"
5148
5249
bp-runner /platform/bp-runner.fail-on-regression.yml --debug
53-
variables:
54-
KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-cpp

0 commit comments

Comments
 (0)