Skip to content

Commit 70a004e

Browse files
committed
Remove installation of bpftrace from source
1 parent 16d4ddf commit 70a004e

File tree

1 file changed

+93
-83
lines changed

1 file changed

+93
-83
lines changed

.github/workflows/test-bpftrace.yml

Lines changed: 93 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: ubuntu
2424
- image: fedora-39
2525
name: fedora
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-22.04
2727
container:
2828
image: "manjusakalza/bpftime-base-image:${{matrix.container.image}}"
2929
options: --privileged
@@ -33,83 +33,83 @@ jobs:
3333
with:
3434
submodules: 'recursive'
3535
path: ./bpftime
36-
- uses: actions/checkout@v2
37-
name: "Pull bpftrace"
38-
with:
39-
repository: "bpftrace/bpftrace"
40-
submodules: 'recursive'
41-
path: './bpftrace_git'
42-
- name: Install bpftrace dependencies in fedora
43-
if: ${{ matrix.container.name=='fedora' }}
44-
run: |
45-
dnf -y update && dnf install -y \
46-
make \
47-
gcc-c++-aarch64-linux-gnu \
48-
gcc-arm-linux-gnu \
49-
clang \
50-
boost-devel \
51-
zlib-devel \
52-
libubsan \
53-
g++ \
54-
llvm \
55-
elfutils-libelf-devel \
56-
qemu-user \
57-
cmake \
58-
gcc-c++ \
59-
gcc-aarch64-linux-gnu \
60-
llvm15-devel \
61-
systemtap-sdt-devel \
62-
gcc \
63-
asciidoctor \
64-
bison \
65-
binutils-devel \
66-
bcc-devel \
67-
cereal-devel \
68-
clang-devel \
69-
elfutils-devel \
70-
elfutils-libs \
71-
flex \
72-
libpcap-devel \
73-
libbpf-devel \
74-
llvm-devel
75-
- name: Install bpftrace dependencies in ubuntu
76-
if: ${{ matrix.container.name=='ubuntu' }}
77-
run: |
78-
apt-get update && apt-get install -y \
79-
--no-install-recommends \
80-
libelf1 \
81-
libelf-dev \
82-
zlib1g-dev \
83-
make \
84-
cmake \
85-
git \
86-
libboost1.74-all-dev \
87-
binutils-dev \
88-
libyaml-cpp-dev \
89-
gcc \
90-
g++ \
91-
ca-certificates \
92-
clang \
93-
llvm \
94-
systemtap-sdt-dev \
95-
libclang-dev \
96-
liblldb-dev \
97-
llvm-dev \
98-
libpcap-dev \
99-
libiberty-dev \
100-
libcereal-dev \
101-
libbpfcc-dev \
102-
flex \
103-
build-essential \
104-
bison \
105-
asciidoctor \
106-
libbpf-dev
107-
- name: Build and install bpftrace
108-
run: |
109-
cd ./bpftrace_git
110-
cmake -B ./bpftrace -DBUILD_TESTING=OFF
111-
make -C ./bpftrace -j$(nproc)
112-
cd -
36+
# - uses: actions/checkout@v2
37+
# name: "Pull bpftrace"
38+
# with:
39+
# repository: "bpftrace/bpftrace"
40+
# submodules: 'recursive'
41+
# path: './bpftrace_git'
42+
# - name: Install bpftrace dependencies in fedora
43+
# if: ${{ matrix.container.name=='fedora' }}
44+
# run: |
45+
# dnf -y update && dnf install -y \
46+
# make \
47+
# gcc-c++-aarch64-linux-gnu \
48+
# gcc-arm-linux-gnu \
49+
# clang \
50+
# boost-devel \
51+
# zlib-devel \
52+
# libubsan \
53+
# g++ \
54+
# llvm \
55+
# elfutils-libelf-devel \
56+
# qemu-user \
57+
# cmake \
58+
# gcc-c++ \
59+
# gcc-aarch64-linux-gnu \
60+
# llvm15-devel \
61+
# systemtap-sdt-devel \
62+
# gcc \
63+
# asciidoctor \
64+
# bison \
65+
# binutils-devel \
66+
# bcc-devel \
67+
# cereal-devel \
68+
# clang-devel \
69+
# elfutils-devel \
70+
# elfutils-libs \
71+
# flex \
72+
# libpcap-devel \
73+
# libbpf-devel \
74+
# llvm-devel
75+
# - name: Install bpftrace dependencies in ubuntu
76+
# if: ${{ matrix.container.name=='ubuntu' }}
77+
# run: |
78+
# apt-get update && apt-get install -y \
79+
# --no-install-recommends \
80+
# libelf1 \
81+
# libelf-dev \
82+
# zlib1g-dev \
83+
# make \
84+
# cmake \
85+
# git \
86+
# libboost1.74-all-dev \
87+
# binutils-dev \
88+
# libyaml-cpp-dev \
89+
# gcc \
90+
# g++ \
91+
# ca-certificates \
92+
# clang \
93+
# llvm \
94+
# systemtap-sdt-dev \
95+
# libclang-dev \
96+
# liblldb-dev \
97+
# llvm-dev \
98+
# libpcap-dev \
99+
# libiberty-dev \
100+
# libcereal-dev \
101+
# libbpfcc-dev \
102+
# flex \
103+
# build-essential \
104+
# bison \
105+
# asciidoctor \
106+
# libbpf-dev
107+
# - name: Build and install bpftrace
108+
# run: |
109+
# cd ./bpftrace_git
110+
# cmake -B ./bpftrace -DBUILD_TESTING=OFF
111+
# make -C ./bpftrace -j$(nproc)
112+
# cd -
113113
- name: Build and install runtime (with llvm-jit)
114114
if: ${{matrix.enable_jit}}
115115
run: |
@@ -171,11 +171,11 @@ jobs:
171171
with:
172172
name: runtime-package-no-jit-${{matrix.container.name}}
173173
path: /app/.bpftime
174-
- name: Download prebuilt bpftrace
175-
uses: actions/download-artifact@v3
176-
with:
177-
name: bpftrace
178-
path: /bpftrace
174+
# - name: Download prebuilt bpftrace
175+
# uses: actions/download-artifact@v3
176+
# with:
177+
# name: bpftrace
178+
# path: /bpftrace
179179
- name: Set permissions
180180
run: |
181181
chmod +x /app/.bpftime/*
@@ -185,6 +185,16 @@ jobs:
185185
- uses: actions/checkout@v2
186186
with:
187187
submodules: 'recursive'
188+
- name: Build bpftrace package in fedora
189+
if: ${{ matrix.container.name=='fedora' }}
190+
shell: bash
191+
run: |
192+
dnf update -y
193+
dnf install -y bpftrace
194+
- name: Build bpftrace package in ubuntu
195+
if: ${{ matrix.container.name=='ubuntu' }}
196+
shell: bash
197+
run: apt update && apt install -y bpftrace
188198
- name: Test CLI - attach by running (is_a_syscall_tracing)
189199
if: matrix.bpftrace_tests.is_a_syscall_tracing
190200
shell: bash

0 commit comments

Comments
 (0)