Skip to content

Commit 9e0d410

Browse files
leoparenteclaude
leoparente
and
claude
authored
chore: update opentelemetry-cpp, protobuf, GitHub Actions and fix flaky netflow test (#768)
* chore: update opentelemetry-cpp and protobuf to latest versions - opentelemetry-cpp: 1.17.0 → 1.24.0 - protobuf: 5.27.0 → 6.33.5 (major version bump) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: set CMAKE_CXX_STANDARD before project() for correct Conan profile on Windows conan_provider.cmake fires during project() via CMAKE_PROJECT_TOP_LEVEL_INCLUDES, before the previous CMAKE_CXX_STANDARD=17 assignment at line 53. MSVC defaults to C++14, causing protobuf/6.33.5 (which requires C++17) to fail validation on Windows. Moving the standard declaration above project() ensures conan_provider.cmake always detects cppstd=17 regardless of platform. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix proto * fix: set cppstd=17 in default Conan profile for Windows builds conan_provider.cmake passes --profile:build=default to conan install. The auto-detected default on MSVC always sets compiler.cppstd=14, which fails validation for protobuf/6.33.5 (requires C++17) when used as a build/tool requirement. Pre-creating the default profile with cppstd=17 before CMake runs ensures both the host and build profiles agree on the C++ standard. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * chore: update GitHub Actions to latest versions actions/*: checkout v4 → v6, cache v4 → v5, upload-artifact v4 → v7, download-artifact v4 → v8, setup-python v4 → v6 docker/*: metadata-action v5.6.1 → v6.0.0, login-action v3.3.0 → v4.1.0, setup-qemu-action v3.2.0 → v4.0.0, setup-buildx-action v3.8.0 → v4.0.0, build-push-action v6.10.0 → v7.1.0 third-party: github-script v8.0.0 → v9.0.0, codecov-action v3 → v6.0.0, codeql-action v3 → v3.35.1 (SHA-pinned), codeql upload-sarif v4.32.6 → v4.35.1, filter-sarif v1 → v1.1 No change: turtlebrowser/get-conan (v1.2 already latest), aquasecurity/trivy-action (v0.35.0 already latest), actions/create-release (archived upstream) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix: load port service names CSV in netflow v5 test The "Parse netflow v5 stream" test was missing the IpPort::set_csv_iana_ports() call, making it depend on global static state populated by sflow tests that happen to run first. When run in isolation (e.g. --randomize-run-order or filtered by [netflow]), the port map is empty so port 23 resolves to "23" instead of "telnet". Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 9d70ccc commit 9e0d410

10 files changed

Lines changed: 105 additions & 86 deletions

File tree

‎.github/workflows/build-develop.yml‎

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
unit-tests-mac:
2323
runs-on: macos-latest
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v6
2626

2727
- name: Create Build Environment
2828
run: cmake -E make_directory ${{github.workspace}}/build
2929

3030
- name: Python Setup
31-
uses: actions/setup-python@v4
31+
uses: actions/setup-python@v6
3232
with:
3333
python-version: '3.10'
3434

@@ -40,7 +40,7 @@ jobs:
4040
run: echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
4141

4242
- name: Setup Conan Cache
43-
uses: actions/cache@v4
43+
uses: actions/cache@v5
4444
with:
4545
path: ${{github.workspace}}/build/p/
4646
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
@@ -70,7 +70,7 @@ jobs:
7070
version_number: ${{ env.VERSION }}
7171
commit_hash: ${{ env.COMMIT }}
7272
steps:
73-
- uses: actions/checkout@v4
73+
- uses: actions/checkout@v6
7474

7575
- name: Create Build Environment
7676
run: cmake -E make_directory ${{github.workspace}}/build
@@ -80,7 +80,7 @@ jobs:
8080
uses: turtlebrowser/get-conan@c171f295f3f507360ee018736a6608731aa2109d #v1.2
8181

8282
- name: Setup Conan Cache
83-
uses: actions/cache@v4
83+
uses: actions/cache@v5
8484
with:
8585
path: ${{github.workspace}}/build/p/
8686
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
@@ -112,7 +112,7 @@ jobs:
112112
outputs:
113113
version_number: ${{ env.VERSION }}
114114
steps:
115-
- uses: actions/checkout@v4
115+
- uses: actions/checkout@v6
116116

117117
- name: Create Build Environment
118118
run: cmake -E make_directory ${{github.workspace}}\build
@@ -121,8 +121,14 @@ jobs:
121121
id: conan
122122
uses: turtlebrowser/get-conan@c171f295f3f507360ee018736a6608731aa2109d #v1.2
123123

124+
- name: Setup Conan Profile
125+
shell: bash
126+
run: |
127+
conan profile detect --force
128+
sed -i 's/compiler.cppstd=14/compiler.cppstd=17/' "$(conan profile path default)"
129+
124130
- name: Setup Conan Cache
125-
uses: actions/cache@v4
131+
uses: actions/cache@v5
126132
with:
127133
path: ${{github.workspace}}/build/p/
128134
key: conan-${{ runner.os }}-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
@@ -161,7 +167,7 @@ jobs:
161167
Get-ChildItem -Force ${{github.workspace}}\build\bin
162168
163169
- name: Persist to workspace
164-
uses: actions/upload-artifact@v4
170+
uses: actions/upload-artifact@v7
165171
with:
166172
name: windows-build
167173
path: |
@@ -175,10 +181,10 @@ jobs:
175181
runs-on: ubuntu-latest
176182
steps:
177183
- name: Checkout code
178-
uses: actions/checkout@v4
184+
uses: actions/checkout@v6
179185

180186
- name: Attach to workspace
181-
uses: actions/download-artifact@v4
187+
uses: actions/download-artifact@v8
182188
with:
183189
name: windows-build
184190

@@ -223,13 +229,13 @@ jobs:
223229
outputs:
224230
version_number: ${{ env.VERSION }}
225231
steps:
226-
- uses: actions/checkout@v4
232+
- uses: actions/checkout@v6
227233

228234
- name: Create Build Environment
229235
run: cmake -E make_directory ${{github.workspace}}/build
230236

231237
- name: Setup Conan Cache
232-
uses: actions/cache@v4
238+
uses: actions/cache@v5
233239
with:
234240
path: ${{github.workspace}}/build/p/
235241
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
@@ -262,12 +268,12 @@ jobs:
262268
263269
- name: Docker meta
264270
id: meta
265-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 #v5.6.1
271+
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf #v6.0.0
266272
with:
267273
images: ${{ env.IMAGE_NAME }}
268274

269275
- name: Login to Docker Hub
270-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 #v3.3.0
276+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 #v4.1.0
271277
with:
272278
username: ${{ secrets.DOCKERHUB_USERNAME }}
273279
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -283,14 +289,14 @@ jobs:
283289
sed -i -e "s/CP_URL/$ESCAPED_REPLACE/g" docker/run.sh
284290
285291
- name: Set up QEMU
286-
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf #v3.2.0
292+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a #v4.0.0
287293

288294
- name: Set up Docker Buildx
289295
id: buildx
290-
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 #v3.8.0
296+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd #v4.0.0
291297

292298
- name: Build + push - pktvisor (multi-arch)
293-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 #v6.10.0
299+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f #v7.1.0
294300
id: docker_build
295301
with:
296302
builder: ${{ steps.buildx.outputs.name }}
@@ -307,7 +313,7 @@ jobs:
307313
touch "/tmp/digests/${digest#sha256:}"
308314
309315
- name: Upload digest
310-
uses: actions/upload-artifact@v4
316+
uses: actions/upload-artifact@v7
311317
with:
312318
name: digests-linux-amd64
313319
path: /tmp/digests/*
@@ -318,7 +324,7 @@ jobs:
318324
needs: [ merge-packages ]
319325
runs-on: ubuntu-latest
320326
steps:
321-
- uses: actions/checkout@v4
327+
- uses: actions/checkout@v6
322328

323329
- name: Create Build Environment
324330
run: cmake -E make_directory ${{github.workspace}}/build
@@ -328,7 +334,7 @@ jobs:
328334
uses: turtlebrowser/get-conan@c171f295f3f507360ee018736a6608731aa2109d #v1.2
329335

330336
- name: Setup Conan Cache
331-
uses: actions/cache@v4
337+
uses: actions/cache@v5
332338
with:
333339
path: ${{github.workspace}}/build/p/
334340
key: conan-${{ runner.os }}-amd64-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
@@ -369,13 +375,13 @@ jobs:
369375
- name: Upload pktvisor-cli artifact
370376
env:
371377
BINARY_NAME: pktvisor-cli-linux-x86_64-${{ env.VERSION }}
372-
uses: actions/upload-artifact@v4
378+
uses: actions/upload-artifact@v7
373379
with:
374380
name: ${{ env.BINARY_NAME }}
375381
path: ${{github.workspace}}/${{ env.BINARY_NAME }}
376382

377383
- name: Login to Docker Hub
378-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 #v3.3.0
384+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 #v4.1.0
379385
with:
380386
username: ${{ secrets.DOCKERHUB_USERNAME }}
381387
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -395,7 +401,7 @@ jobs:
395401
mv pktvisor-x86_64.AppImage pktvisor-x86_64-${{ env.VERSION }}.AppImage
396402
397403
- name: Upload AppImage artifact
398-
uses: actions/upload-artifact@v4
404+
uses: actions/upload-artifact@v7
399405
with:
400406
name: pktvisor-x86_64-${{ env.VERSION }}.AppImage
401407
path: ${{github.workspace}}/appimage/pktvisor-x86_64-${{ env.VERSION }}.AppImage
@@ -410,13 +416,13 @@ jobs:
410416
sudo chown -R $USER:$USER $GITHUB_WORKSPACE
411417
412418
- name: Checkout
413-
uses: actions/checkout@v4
419+
uses: actions/checkout@v6
414420

415421
- name: Create Build Environment
416422
run: cmake -E make_directory ${{github.workspace}}/build
417423

418424
- name: Setup Conan Cache
419-
uses: actions/cache@v4
425+
uses: actions/cache@v5
420426
with:
421427
path: ${{github.workspace}}/build/p/
422428
key: conan-${{ runner.os }}-arm64-${{ hashFiles('conanfile.py', '*/conanfile.py') }}
@@ -446,22 +452,22 @@ jobs:
446452

447453
- name: Docker meta
448454
id: meta
449-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 #v5.6.1
455+
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf #v6.0.0
450456
with:
451457
images: ${{ env.IMAGE_NAME }}
452458

453459
- name: Login to Docker Hub
454-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 #v3.3.0
460+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 #v4.1.0
455461
with:
456462
username: ${{ secrets.DOCKERHUB_USERNAME }}
457463
password: ${{ secrets.DOCKERHUB_TOKEN }}
458464

459465
- name: Set up QEMU
460-
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf #v3.2.0
466+
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a #v4.0.0
461467

462468
- name: Set up Docker Buildx
463469
id: buildx
464-
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 #v3.8.0
470+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd #v4.0.0
465471

466472
- name: Replace token
467473
run: |
@@ -475,7 +481,7 @@ jobs:
475481
476482
- name: Build + push - pktvisor (multi-arch)
477483
id: docker_build
478-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 #v6.10.0
484+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f #v7.1.0
479485
with:
480486
builder: ${{ steps.buildx.outputs.name }}
481487
context: .
@@ -491,7 +497,7 @@ jobs:
491497
touch "/tmp/digests/${digest#sha256:}"
492498
493499
- name: Upload digest
494-
uses: actions/upload-artifact@v4
500+
uses: actions/upload-artifact@v7
495501
with:
496502
name: digests-linux-arm64
497503
path: /tmp/digests/*
@@ -503,25 +509,25 @@ jobs:
503509
needs: [unit-tests-linux, package-amd64, package-arm64]
504510
steps:
505511
- name: Download digests
506-
uses: actions/download-artifact@v4
512+
uses: actions/download-artifact@v8
507513
with:
508514
path: /tmp/digests
509515
pattern: digests-*
510516
merge-multiple: true
511517

512518
- name: Login to Docker Hub
513-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 #v3.3.0
519+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 #v4.1.0
514520
with:
515521
username: ${{ secrets.DOCKERHUB_USERNAME }}
516522
password: ${{ secrets.DOCKERHUB_TOKEN }}
517523

518524
- name: Set up Docker Buildx
519525
id: buildx
520-
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 #v3.8.0
526+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd #v4.0.0
521527

522528
- name: Docker meta
523529
id: meta
524-
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 #v5.6.1
530+
uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf #v6.0.0
525531
with:
526532
images: ${{ env.IMAGE_NAME }}
527533
tags: |

0 commit comments

Comments
 (0)