Skip to content

Commit 8d034bd

Browse files
authored
Merge pull request #108 from Atul-source/usr-prog-fix-orc
adding worflow for noble and fixed for orcular codename
2 parents 30dc38b + 23ba7fc commit 8d034bd

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

.github/workflows/ci-build-ubuntu.yaml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ on:
88
jobs:
99
eBPF-Programs-Build:
1010
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
codename: [ jammy, noble ]
1114
container:
12-
image: ubuntu:focal
15+
image: ubuntu:${{ matrix.codename }}
1316
steps:
1417
- name: Set env variables
1518
run: |
@@ -52,14 +55,8 @@ jobs:
5255
5356
- name: Clone dependencies
5457
run: |
55-
git clone --branch v5.15 --depth 1 https://github.com/torvalds/linux.git $LINUX_SRC_PATH
58+
git clone --branch v6.8 --depth 1 https://github.com/torvalds/linux.git $LINUX_SRC_PATH
5659
cd $LINUX_SRC_PATH
57-
sed -i '229a\
58-
if [ "${pahole_ver}" -ge "124" ]; then\
59-
extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"\
60-
fi' scripts/link-vmlinux.sh
61-
echo "CONFIG_DEBUG_INFO_BTF=y" >> .config
62-
echo "CONFIG_MODULES=y" >> .config
6360
make olddefconfig
6461
make prepare
6562
yes | make -j$(nproc)
@@ -87,35 +84,35 @@ jobs:
8784
- name: Upload xdp-root
8885
uses: actions/upload-artifact@v4
8986
with:
90-
name: xdp-root-linux-artifact
87+
name: xdp-root-linux-artifact-${{ matrix.codename }}
9188
path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/xdp-root/l3af_xdp_root/*
9289

9390
- name: Upload ratelimiting
9491
uses: actions/upload-artifact@v4
9592
with:
96-
name: ratelimiting-linux-artifact
93+
name: ratelimiting-linux-artifact-${{ matrix.codename }}
9794
path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/ratelimiting/l3af_ratelimiting/*
9895

9996
- name: Upload connection-limit
10097
uses: actions/upload-artifact@v4
10198
with:
102-
name: connection-limit-linux-artifact
99+
name: connection-limit-linux-artifact-${{ matrix.codename }}
103100
path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/connection-limit/l3af_connection_limit/*
104101

105102
- name: Upload tc-root
106103
uses: actions/upload-artifact@v4
107104
with:
108-
name: tc-root-linux-artifact
105+
name: tc-root-linux-artifact-${{ matrix.codename }}
109106
path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/tc-root/l3af_tc_root/*
110107

111108
- name: Upload ipfix-flow-exporter
112109
uses: actions/upload-artifact@v4
113110
with:
114-
name: ipfix-flow-exporter-linux-artifact
111+
name: ipfix-flow-exporter-linux-artifact-${{ matrix.codename }}
115112
path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/ipfix-flow-exporter/l3af_bpf_ipfix/*
116113

117114
- name: Upload traffic-mirroring
118115
uses: actions/upload-artifact@v4
119116
with:
120-
name: traffic-mirroring-linux-artifact
117+
name: traffic-mirroring-linux-artifact-${{ matrix.codename }}
121118
path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/traffic-mirroring/l3af_traffic_mirroring/*

connection-limit/connection_limit_user.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <string.h>
2323
#include <sys/resource.h>
2424
#include <sys/time.h>
25+
#include <sys/stat.h>
2526
#include <time.h>
2627
#include <unistd.h>
2728

0 commit comments

Comments
 (0)