From 76933160a404f720aac061ce03fb054b5dd33e6b Mon Sep 17 00:00:00 2001 From: Manu Bretelle Date: Sun, 25 Aug 2024 17:55:06 +0100 Subject: [PATCH 1/3] ci: Add release build for gcc/x86_64 Now that we are running on Ubuntu 24.04, the gcc version is enough up-to-date to be able to build in release mode. Signed-off-by: Manu Bretelle --- .github/scripts/matrix.py | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/scripts/matrix.py b/.github/scripts/matrix.py index c3390215..9c660384 100644 --- a/.github/scripts/matrix.py +++ b/.github/scripts/matrix.py @@ -159,6 +159,7 @@ def generate_test_config(test: str) -> Dict[str, Union[str, int]]: toolchain=Toolchain(compiler=Compiler.GCC, version=DEFAULT_LLVM_VERSION), run_veristat=True, parallel_tests=True, + build_release=True, ), BuildConfig( arch=Arch.X86_64, From 5e6421db3f31df65894bd1216bf5cadfaf660709 Mon Sep 17 00:00:00 2001 From: Manu Bretelle Date: Sun, 25 Aug 2024 17:59:38 +0100 Subject: [PATCH 2/3] ci: Run CI on Ubuntu 24.04 for non self-hosted projects We don't use rootfs for kernel-patches' vmtest anymore so the constraint that was documented does not hold anymore. Moreover, we the introduction to optimzed gcc builds, we need to run on a newer version of the runners. Signed-off-by: Manu Bretelle --- .github/scripts/matrix.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/scripts/matrix.py b/.github/scripts/matrix.py index 9c660384..dd483b55 100644 --- a/.github/scripts/matrix.py +++ b/.github/scripts/matrix.py @@ -12,10 +12,7 @@ f"{MANAGED_OWNER}/bpf", f"{MANAGED_OWNER}/vmtest", } -# We need to run on ubuntu 20.04 because our rootfs is based on debian buster and we -# otherwise get library versioning issue such as -# `./test_verifier: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34' not found (required by ./test_verifier)` -DEFAULT_RUNNER: Final[str] = "ubuntu-20.04" +DEFAULT_RUNNER: Final[str] = "ubuntu-24.04" DEFAULT_LLVM_VERSION: Final[int] = 17 DEFAULT_SELF_HOSTED_RUNNER_TAGS: Final[List[str]] = ["self-hosted", "docker-noble-main"] From fc041dd5dc1214f752c4451b5701c9e786d3b07f Mon Sep 17 00:00:00 2001 From: Manu Bretelle Date: Mon, 26 Aug 2024 20:02:58 +0100 Subject: [PATCH 3/3] build: print $toolchain --version Signed-off-by: Manu Bretelle --- .github/workflows/kernel-build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/kernel-build.yml b/.github/workflows/kernel-build.yml index cf378dd9..560f53e0 100644 --- a/.github/workflows/kernel-build.yml +++ b/.github/workflows/kernel-build.yml @@ -94,6 +94,14 @@ jobs: arch: ${{ inputs.arch }} llvm-version: ${{ inputs.llvm-version }} pahole: c2f89dab3f2b0ebb53bab3ed8be32f41cb743c37 + - name: Print toolchain version used + shell: bash + run: | + TOOLCHAIN=${{ inputs.toolchain }} + if [ $TOOLCHAIN = "llvm" ]; then + TOOLCHAIN="clang-${{ inputs.llvm-version }}" + fi + ${TOOLCHAIN} --version - name: Build kernel image uses: libbpf/ci/build-linux@main with: