conflict

linuxkerneltravel · Apr 23, 2024 · 70a938c · 70a938c
2 parents 61e319c + 51bec6c
commit 70a938c
Show file tree

Hide file tree

Showing 987 changed files with 141,478 additions and 1,352 deletions.
diff --git a/.github/workflows/Memory_Subsystem__paf.yml b/.github/workflows/Memory_Subsystem__paf.yml
diff --git a/.github/workflows/Memory_Subsystem__pr.yml b/.github/workflows/Memory_Subsystem__pr.yml
diff --git a/.github/workflows/Memory_Subsystem__procstat.yml b/.github/workflows/Memory_Subsystem__procstat.yml
diff --git a/.github/workflows/Memory_Subsystem__sysstat.yml b/.github/workflows/Memory_Subsystem__sysstat.yml
diff --git a/.github/workflows/dns_cache.yml b/.github/workflows/dns_cache.yml
diff --git a/.github/workflows/eBPF_hub_test.yml b/.github/workflows/eBPF_hub_test.yml
diff --git a/.github/workflows/cpu_watcher.yml → .github/workflows/ebpf_cpu_watcher.yml b/.github/workflows/cpu_watcher.yml → .github/workflows/ebpf_cpu_watcher.yml
@@ -15,7 +15,7 @@ on:
       - '.github/workflows/cpu_watcher.yml'
 
 jobs:
-  libbpf-project-build-and-test:
+  cpu_watcher-project-build-and-test:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/ebpf_ddos.yml b/.github/workflows/ebpf_ddos.yml
diff --git a/.github/workflows/fast_fuse.yml → .github/workflows/ebpf_fast_fuse.yml b/.github/workflows/fast_fuse.yml → .github/workflows/ebpf_fast_fuse.yml
diff --git a/.github/workflows/kvm_watcher.yml → .github/workflows/ebpf_kvm_watcher.yml b/.github/workflows/kvm_watcher.yml → .github/workflows/ebpf_kvm_watcher.yml
diff --git a/.github/workflows/ebpf_lsm.yml b/.github/workflows/ebpf_lsm.yml
diff --git a/...rkflows/Memory_Subsystem__mem_watcher.yml → .github/workflows/ebpf_mem_watcher.yml b/...rkflows/Memory_Subsystem__mem_watcher.yml → .github/workflows/ebpf_mem_watcher.yml
@@ -5,18 +5,18 @@ on:
     branches:
       - "*"
     paths: 
-      - 'eBPF_Supermarket/Memory_Subsystem/applications/mem_watcher/**'
-      - '.github/workflows/Memory_Subsystem__mem_watcher.yml'
+      - 'eBPF_Supermarket/Memory_Subsystem/mem_watcher/**'
+      - '.github/workflows/ebpf_mem_watcher.yml'
   pull_request:
     branches:
       - "*"
     paths:
-      - 'eBPF_Supermarket/Memory_Subsystem/applications/mem_watcher/**'
-      - '.github/workflows/Memory_Subsystem__mem_watcher.yml'
+      - 'eBPF_Supermarket/Memory_Subsystem/mem_watcher/**'
+      - '.github/workflows/ebpf_mem_watcher.yml'
 
 jobs:
-  libbpf-project-build-and-test:
-    runs-on: ubuntu-20.04
+  mem_watcher-project-build-and-test:
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
 
@@ -29,7 +29,7 @@ jobs:
       - name: Run mem_watcher
         continue-on-error: true
         run: |
-          cd eBPF_Supermarket/Memory_Subsystem/applications/mem_watcher/
+          cd eBPF_Supermarket/Memory_Subsystem/mem_watcher/
           bpftool btf dump file /sys/kernel/btf/vmlinux format c > vmlinux.h
           make
           sudo timeout 20 ./mem_watcher
diff --git a/.github/workflows/net_manager.yml → .github/workflows/ebpf_net_manager.yml b/.github/workflows/net_manager.yml → .github/workflows/ebpf_net_manager.yml
@@ -18,7 +18,7 @@ permissions:
   contents: write
 
 jobs:
-  build-and-run:
+  net_manager_build-and-run:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out repository code

diff --git a/.github/workflows/net_traffic_manager.yml → ...ub/workflows/ebpf_net_traffic_manager.yml b/.github/workflows/net_traffic_manager.yml → ...ub/workflows/ebpf_net_traffic_manager.yml
@@ -15,7 +15,7 @@ on:
       - '.github/workflows/net_traffic_manager.yml'
 
 jobs:
-  build-and-test:
+  TrafficManager_build-and-test:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/net_watcher.yml → .github/workflows/ebpf_net_watcher.yml b/.github/workflows/net_watcher.yml → .github/workflows/ebpf_net_watcher.yml
@@ -18,7 +18,7 @@ permissions:
   contents: write
 
 jobs:
-  build-and-run:
+  net_watcher_build-and-run:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/ebpf_prometheus.yml b/.github/workflows/ebpf_prometheus.yml
@@ -15,7 +15,7 @@ on:
       - '.github/workflows/ebpf_prometheus.yml'
 
 jobs:
-  web-backend-build-and-run:
+  eBPF_prometheus-build-and-run:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3