fix(ci)

hengyoush · Oct 19, 2024 · 9580e98 · 9580e98
1 parent 584b28e
commit 9580e98
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,7 +42,7 @@ jobs:
         sudo apt install -y clang
         pwd
         ls -l
-        make clean && make build-bpf && make btfgen && make
+        make clean && make build-bpf && make btfgen BUILD_ARCH=x86_64 ARCH_BPF_NAME=x86 && make
 
     # - name: Test
     #   run: make test

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -23,7 +23,6 @@ builds:
     env:
       - CGO_ENABLED=1
       - CC=aarch64-linux-gnu-gcc
-      - BUILD_ARCH=arm64
     flags:
       - -tags=static
     ldflags:
@@ -37,15 +36,14 @@ builds:
       pre:
         - bash -c 'sudo make clean || true'
         - bash -c 'sudo make build-bpf || true' 
-        - bash -c 'sudo make btfgen' 
+        - bash -c 'sudo make btfgen BUILD_ARCH=arm64 ARCH_BPF_NAME=arm64' 
 
   - id: kyanos-amd64
     binary: kyanos
     env:
       - CGO_ENABLED=1
       - CC=gcc
       # - CGO_LDFLAGS="-Xlinker -rpath=. -static"
-      - BUILD_ARCH=x86_64
     flags:
       - -tags=static
     ldflags:
@@ -59,7 +57,7 @@ builds:
       pre:
         - bash -c 'sudo make clean || true'
         - bash -c 'sudo make build-bpf || true'
-        - bash -c 'sudo make btfgen' 
+        - bash -c 'sudo make btfgen BUILD_ARCH=x86_64 ARCH_BPF_NAME=x86' 
 
 archives:
   - builds:

diff --git a/Makefile b/Makefile
@@ -75,7 +75,7 @@ kyanos: $(GO_FILES)
 
 .PHONY: btfgen
 btfgen:
-	./btfgen.sh
+	./btfgen.sh $(BUILD_ARCH) $(ARCH_BPF_NAME)
 
 # delete failed targets
 .DELETE_ON_ERROR:

diff --git a/btfgen.sh b/btfgen.sh
@@ -8,7 +8,7 @@ BTFHUB_REPO="https://github.com/aquasecurity/btfhub.git"
 BTFHUB_ARCH_REPO="https://github.com/aquasecurity/btfhub-archive.git"
 
 
-KYANOS_BPF_CORE="${BASEDIR}/bpf/agent_x86_bpfel.o"
+KYANOS_BPF_CORE="${BASEDIR}/bpf/agent_$1_bpfel.o"
 
 BTFHUB_DIR="${BASEDIR}/deps/btfhub"
 BTFHUB_ARCH_DIR="${BASEDIR}/deps/btfhub-archive"
@@ -53,7 +53,7 @@ CMDS="rsync git cp rm mv"
 for cmd in ${CMDS}; do
     command -v $cmd 2>&1 >/dev/null || die "cmd ${cmd} not found"
 done
-[ ! -f ${KYANOS_BPF_CORE} ] && die "tracee CO-RE obj not found"
+[ ! -f ${KYANOS_BPF_CORE} ] && die "kyanos CO-RE obj not found: ${KYANOS_BPF_CORE}"
 
 [ ! -d ${BTFHUB_DIR} ] && git clone "${BTFHUB_REPO}" ${BTFHUB_DIR}
 [ ! -d ${BTFHUB_ARCH_DIR} ] && git clone "${BTFHUB_ARCH_REPO}" ${BTFHUB_ARCH_DIR}
@@ -79,7 +79,7 @@ rsync -avz \
 # generate tailored BTFs
 
 [ ! -f ./tools/btfgen.sh ] && die "could not find btfgen.sh"
-./tools/btfgen.sh -a ${BUILD_ARCH} -o ${KYANOS_BPF_CORE}
+./tools/btfgen.sh -a $2 -o ${KYANOS_BPF_CORE}
 
 
 # move tailored BTFs to dist