Skip to content

Commit c6b5844

Browse files
committed
CI: switch from 6.6 to 6.7
Test against the latest mainline release instead of the latest stable. This will allow testing netkit devices. Signed-off-by: Lorenz Bauer <[email protected]>
1 parent ee85399 commit c6b5844

File tree

7 files changed

+64
-42
lines changed

7 files changed

+64
-42
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
timeout-minutes: 10
174174
strategy:
175175
matrix:
176-
version: ["6.6", "6.1", "5.15", "5.10", "5.4", "4.19", "4.14", "4.9"]
176+
version: ["6.7", "6.1", "5.15", "5.10", "5.4", "4.19", "4.14", "4.9"]
177177
env:
178178
KERNEL_VERSION: "${{ matrix.version }}"
179179
steps:

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ testdata/loader-%-eb.elf: testdata/loader.c
104104
$(STRIP) -g $@
105105

106106
.PHONY: update-kernel-deps
107-
update-kernel-deps: export KERNEL_VERSION?=6.6
107+
update-kernel-deps: export KERNEL_VERSION?=6.7
108108
update-kernel-deps:
109109
./testdata/sh/update-kernel-deps.sh
110110
$(MAKE) container-all

btf/testdata/btf_testmod.btf

34 Bytes
Binary file not shown.

btf/testdata/vmlinux.btf.gz

-60.6 KB
Binary file not shown.

elf_reader_test.go

+9-3
Original file line numberDiff line numberDiff line change
@@ -996,14 +996,20 @@ func TestLibBPFCompat(t *testing.T) {
996996
case "netif_receive_skb",
997997
"local_kptr_stash",
998998
"local_kptr_stash_fail",
999-
"type_cast":
1000-
t.Skip("Skipping due to possible bug in upstream CO-RE generation")
999+
"type_cast",
1000+
"preempted_bpf_ma_op",
1001+
"percpu_alloc_fail":
1002+
// Error message like
1003+
// fixup for CORERelocation(local_type_id, Struct:"bin_data"[0],
1004+
// local_id=27): invalid immediate 31, expected 27 (fixup: local_type_id=27->1)
1005+
// See https://github.com/cilium/ebpf/issues/739
1006+
t.Skip("Skipping due to bug in libbpf type deduplication")
10011007
case "test_usdt", "test_urandom_usdt", "test_usdt_multispec":
10021008
t.Skip("Skipping due to missing support for usdt.bpf.h")
10031009
case "lsm_cgroup", "bpf_iter_ipv6_route", "test_core_extern",
10041010
"profiler1", "profiler2", "profiler3":
10051011
t.Skip("Skipping due to using weak CONFIG_* variables")
1006-
case "linked_maps1", "linked_maps2", "linked_funcs1", "linked_funcs2",
1012+
case "linked_maps", "linked_maps1", "linked_maps2", "linked_funcs1", "linked_funcs2",
10071013
"test_subskeleton", "test_subskeleton_lib":
10081014
t.Skip("Skipping due to relying on cross ELF linking")
10091015
}

elf_sections.go

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/sys/types.go

+46-37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)