Skip to content

Commit 1b69a55

Browse files
committed
fix(ci): LLVM apt repo
1 parent 5729e80 commit 1b69a55

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

.github/workflows/push.yml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,6 @@ jobs:
146146
fail-fast: false
147147
matrix:
148148
arch: [amd64] # TODO: arm64 (bpftool not working)
149-
flags:
150-
- name: generic
151-
flags: ""
152-
- name: compat-6.1
153-
flags: COMPAT_LINUX_6_1=1
154-
- name: compat-6.6
155-
flags: COMPAT_LINUX_6_6=1
156149
steps:
157150
- name: Checkout
158151
uses: actions/checkout@v4
@@ -161,7 +154,8 @@ jobs:
161154
run: |
162155
wget https://apt.llvm.org/llvm.sh
163156
chmod +x llvm.sh
164-
for _clang_version in {15..21}; do
157+
# Ubuntu 24.04 officially packages LLVM 15 and 16
158+
for _clang_version in {17..21}; do
165159
sudo ./llvm.sh $_clang_version
166160
done
167161
sudo apt update
@@ -174,16 +168,20 @@ jobs:
174168
- name: Build CLI
175169
shell: bash
176170
run: |
177-
for _clang_version in {15..21}; do
178-
export BPF_CC=clang-$_clang_version
179-
make build-cli -j ${{ matrix.flags.flags }}
180-
mv out/mimic out/mimic-clang-$_clang_version
171+
flags_name=(generic compat-6.1 compat-6.6)
172+
flags=("" "COMPAT_LINUX_6_1=1" "COMPAT_LINUX_6_6=1")
173+
for _i in {0..2}; do
174+
for _clang_version in {15..21}; do
175+
export BPF_CC=clang-$_clang_version
176+
make build-cli -j ${flags[$_i]}
177+
mv out/mimic out/mimic-${flags_name[$_i]}-clang-$_clang_version
178+
done
181179
done
182180
- name: Upload executable
183181
uses: actions/upload-artifact@v4
184182
with:
185-
name: mimic-${{ matrix.flags.name }}-${{ matrix.arch }}
186-
path: out/mimic-clang-*
183+
name: mimic-${{ matrix.arch }}
184+
path: out/mimic-*
187185

188186
test-lvh:
189187
name: Test LVH
@@ -211,7 +209,7 @@ jobs:
211209
- name: Download artifact
212210
uses: actions/download-artifact@v4
213211
with:
214-
name: mimic-${{ matrix.kernel.variant }}-${{ matrix.arch }}
212+
name: mimic-${{ matrix.arch }}
215213
path: out
216214
- name: Install LVH CLI
217215
uses: ./.github/actions/lvh-install-cli
@@ -316,8 +314,9 @@ jobs:
316314
uname -a
317315
cd /host
318316
insmod kmod/mimic.ko
319-
chmod +x out/mimic-clang-*
320-
for _mimic in mimic-clang-*; do
317+
cd out
318+
chmod +x mimic-*
319+
for _mimic in mimic-${{ matrix.kernel.variant }}-*; do
321320
echo Checking $_mimic
322321
$_mimic run lo --check
323322
done

0 commit comments

Comments
 (0)