Sync libbpf/ci#164

theihor · Jan 10, 2025 · 59bb0f3 · 59bb0f3
1 parent cb04127
commit 59bb0f3
Show file tree

Hide file tree

Showing 4 changed files with 922 additions and 3 deletions.
diff --git a/.github/scripts/matrix.py b/.github/scripts/matrix.py
@@ -101,6 +101,9 @@ def tests(self) -> Dict[str, Any]:
         # if self.arch in [Arch.X86_64, Arch.AARCH64]:
         #     tests_list.append("sched_ext")
 
+        if self.arch == Arch.X86_64:
+            tests_list.append("test_progs-bpf_gcc")
+
         if not self.parallel_tests:
             tests_list = [test for test in tests_list if not test.endswith("parallel")]
 

diff --git a/.github/workflows/kernel-build.yml b/.github/workflows/kernel-build.yml
@@ -46,6 +46,10 @@ jobs:
     timeout-minutes: 100
     env:
         ARTIFACTS_ARCHIVE: "vmlinux-${{ inputs.arch }}-${{ inputs.toolchain_full }}.tar.zst"
+
+        BUILD_BPF_GCC: ${{ inputs.arch == 'x86_64' && 'true' || '' }}
+        BPF_GCC_INSTALL_DIR: ${{ github.workspace }}/bpf-gcc
+
         BPF_NEXT_BASE_BRANCH: 'master'
         BPF_NEXT_FETCH_DEPTH: 64 # A bit of history is needed to facilitate incremental builds
         # BUILD_SCHED_EXT_SELFTESTS: ${{ inputs.arch == 'x86_64' || inputs.arch == 'aarch64' && 'true' || '' }}
@@ -92,7 +96,7 @@ jobs:
           repo-root: ${{ env.REPO_ROOT }}
 
       - name: Setup build environment
-        uses: libbpf/ci/setup-build-env@v2
+        uses: theihor/libbpf-ci/setup-build-env@bpf-gcc
         with:
           arch: ${{ inputs.arch }}
           llvm-version: ${{ inputs.llvm-version }}
@@ -106,11 +110,19 @@ jobs:
           kbuild-output: ${{ env.KBUILD_OUTPUT }}
           max-make-jobs: 32
           llvm-version: ${{ inputs.llvm-version }}
+
+      - if: ${{ env.BUILD_BPF_GCC }}
+        name: Build GCC for BPF selftests
+        uses: theihor/libbpf-ci/build-bpf-gcc@bpf-gcc
+        with:
+          install-dir: ${{ env.BPF_GCC_INSTALL_DIR }}
+
       - name: Build selftests/bpf
-        uses: libbpf/ci/build-selftests@v2
+        uses: theihor/libbpf-ci/build-selftests@bpf-gcc
         env:
           MAX_MAKE_JOBS: 32
           RELEASE: ${{ inputs.release && '1' || '' }}
+          BPF_GCC: ${{ env.BUILD_BPF_GCC && env.BPF_GCC_INSTALL_DIR || '' }}
         with:
           arch: ${{ inputs.arch }}
           kernel-root: ${{ env.KERNEL_ROOT }}

diff --git a/.github/workflows/kernel-test.yml b/.github/workflows/kernel-test.yml
@@ -65,7 +65,7 @@ jobs:
         run: zstd -d -T0  vmlinux-${{ inputs.arch }}-${{ inputs.toolchain_full }}.tar.zst --stdout | tar -xf -
 
       - name: Run selftests
-        uses: theihor/libbpf-ci/run-vmtest@run-vmtest-update
+        uses: theihor/libbpf-ci/run-vmtest@bpf-gcc
         # https://github.com/actions/runner/issues/1483#issuecomment-1031671517
         # booleans are weird in GH.
         continue-on-error: ${{ fromJSON(env.CONTINUE_ON_ERROR) }}