Merge branch 'netdata:master' into master

netdata · May 2, 2024 · 5c835f9 · 5c835f9
2 parents 4936648 + 2fcf2fd
commit 5c835f9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
           ls -lah artifacts
           test -f artifacts/netdata_ebpf-*.tar.xz
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: artifacts-${{ matrix.kernel_version }}-${{ matrix.libc }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
           ls -lah artifacts
           test -f artifacts/netdata_ebpf-co-re-*.tar.xz
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: artifacts
@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download all Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: artifacts
           path: artifacts

diff --git a/kernel-collector b/kernel-collector
diff --git a/libbpf b/libbpf