Skip to content

Commit 9e9f67c

Browse files
author
Codex
committed
fix: resolve merge conflicts with main (keep both privacy mode + jitter features)
2 parents 32a3739 + 44b2141 commit 9e9f67c

33 files changed

Lines changed: 3286 additions & 2293 deletions

.github/workflows/flaky-test-triage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
110110
- name: Upload flaky test report
111111
if: always()
112-
uses: actions/upload-artifact@v3
112+
uses: actions/upload-artifact@v7
113113
with:
114114
name: flaky-test-report
115115
path: test-results/flaky-tests-report.md

.github/workflows/generate-openapi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
run: npm run swagger:export
3333

3434
- name: Upload OpenAPI artifact
35-
uses: actions/upload-artifact@v4
35+
uses: actions/upload-artifact@v7
3636
with:
3737
name: openapi-spec
3838
path: docs/api-reference/openapi.json

0 commit comments

Comments
 (0)