Just output one netdata tarball and improve the filename silghtly

netdata · Feb 13, 2020 · 4887b39 · 4887b39
1 parent ddd853c
commit 4887b39
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
       - name: List Artifacts
         run: |
           ls -lah artifacts
-          test -f artifacts/netdata_ebpf_*.tar.xz
+          test -f artifacts/netdata_ebpf-*.tar.xz
       - name: Upload Artifacts
         uses: actions/upload-artifact@v1
         if: success()

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
       - name: List Artifacts
         run: |
           ls -lah artifacts
-          test -f artifacts/netdata_ebpf_*.tar.xz
+          test -f artifacts/netdata_ebpf-*.tar.xz
       - name: Upload Artifacts
         uses: actions/upload-artifact@v1
         if: success()
@@ -98,8 +98,8 @@ jobs:
         id: asset-filename
         run: |
           cd artifacts-${{ matrix.kernel_version }}-${{ matrix.libc }}
-          ls netdata_ebpf_*.tar.xz
-          echo "::set-output name=name::$(ls netdata_ebpf_*.tar.xz)"
+          ls netdata_ebpf-*.tar.xz
+          echo "::set-output name=name::$(ls netdata_ebpf-*.tar.xz)"
       - name: Upload Release Asset ${{ steps.asset-filename.outputs.name }}
         uses: actions/upload-release-asset@v1
         env:

diff --git a/user/Makefile b/user/Makefile
@@ -18,8 +18,7 @@ all: $(OBJECT_LIBLOAD) $(KERNEL_PROGRAM)
 	cp $(KERNEL_DIR)pprocess_kern.o pnetdata_ebpf_process.o
 	cp $(KERNEL_DIR)dprocess_kern.o dnetdata_ebpf_process.o
 	$(CC) -L. -I../includes/ -o process_monitor process_user.c $(LIBS)
-	if [ -f /usr/lib64/libbpf_kernel.so ]; then tar -acf ../artifacts/netdata_ebpf64_$(NETDATA_KERNEL_VERSION)-$(_LIBC).tar.xz /usr/lib64/libbpf_kernel.so* libnetdata_ebpf.so *netdata_ebpf_process.o; fi
-	if [ -f /usr/lib/libbpf_kernel.so ]; then tar -acf ../artifacts/netdata_ebpf_$(NETDATA_KERNEL_VERSION)-$(_LIBC).tar.xz /usr/lib/libbpf_kernel.so* libnetdata_ebpf.so *netdata_ebpf_process.o; fi
+	if [ -f /usr/lib64/libbpf_kernel.so ]; then tar -acf ../artifacts/netdata_ebpf-$(NETDATA_KERNEL_VERSION)-$(_LIBC).tar.xz /usr/lib64/libbpf_kernel.so* libnetdata_ebpf.so *netdata_ebpf_process.o; elif [ -f /usr/lib/libbpf_kernel.so ]; then tar -acf ../artifacts/netdata_ebpf-$(NETDATA_KERNEL_VERSION)-$(_LIBC).tar.xz /usr/lib/libbpf_kernel.so* libnetdata_ebpf.so *netdata_ebpf_process.o; else echo "ERROR: Cannot find libbpf_kernel.so"; exit 1; fi
 
 
 $(OBJECT_LIBLOAD):