Skip to content

Commit 539ad9e

Browse files
committed
fix(ci): install bpftool from source and use zig stable
Signed-off-by: Roberto Scolaro <[email protected]>
1 parent fcdf2a8 commit 539ad9e

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

.github/workflows/ci.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@ jobs:
4747
rpm \
4848
wget \
4949
xz-utils && \
50+
git clone https://github.com/libbpf/bpftool.git --branch v7.3.0 --single-branch && \
51+
cd bpftool && \
52+
git submodule update --init && \
53+
cd src && \
54+
make install && \
55+
cd ../.. && \
56+
rm -fr bpftool && \
5057
curl -LO "https://ziglang.org/download/${ZIG_VERSION}/zig-$(uname -m)-linux-${ZIG_VERSION}.tar.xz" && \
5158
tar -xaf "zig-$(uname -m)-linux-${ZIG_VERSION}.tar.xz" && \
5259
rm -v "zig-$(uname -m)-linux-${ZIG_VERSION}.tar.xz" && \

.github/workflows/release-draft.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
release_arch: aarch64
2929

3030
env:
31-
ZIG_VERSION: 0.14.0-dev.3259+0779e847f
31+
ZIG_VERSION: 0.14.1
3232

3333
steps:
3434
- name: Checkout Sysdig
@@ -42,8 +42,6 @@ jobs:
4242
cp -v scripts/zig-c++ /usr/bin/
4343
apt update && \
4444
apt install -y --no-install-recommends \
45-
autoconf \
46-
automake \
4745
build-essential \
4846
ca-certificates \
4947
clang \
@@ -52,6 +50,7 @@ jobs:
5250
git \
5351
libelf-dev \
5452
libtool \
53+
linux-tools-`uname -r` \
5554
llvm \
5655
ninja-build \
5756
pkg-config \
@@ -65,15 +64,16 @@ jobs:
6564
make install && \
6665
cd ../.. && \
6766
rm -fr bpftool && \
68-
curl -LO https://ziglang.org/builds/zig-linux-"$(uname -m)"-"${ZIG_VERSION}".tar.xz && \
69-
tar -xaf zig-linux-"$(uname -m)"-"${ZIG_VERSION}".tar.xz && \
70-
rm -v zig-linux-"$(uname -m)"-"${ZIG_VERSION}".tar.xz && \
71-
cd zig-linux-"$(uname -m)"-"${ZIG_VERSION}" && \
67+
curl -LO "https://ziglang.org/download/${ZIG_VERSION}/zig-$(uname -m)-linux-${ZIG_VERSION}.tar.xz" && \
68+
tar -xaf "zig-$(uname -m)-linux-${ZIG_VERSION}.tar.xz" && \
69+
rm -v "zig-$(uname -m)-linux-${ZIG_VERSION}.tar.xz" && \
70+
cd zig-* && \
7271
cp -v zig /usr/bin && \
7372
find lib -exec cp --parents {} /usr/ \; && \
7473
cd .. && \
7574
rm -fr zig*
7675
76+
7777
- name: Build Sysdig
7878
env:
7979
CC: zig-cc

0 commit comments

Comments
 (0)