kernel-build: libbpf/ci/tar-artifacts action

See libbpf/ci#148
kernel-patches · Oct 23, 2024 · cf16b04 · cf16b04
1 parent ae3b1f3
commit cf16b04
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/.github/workflows/kernel-build.yml b/.github/workflows/kernel-build.yml
@@ -45,16 +45,17 @@ jobs:
     runs-on: ${{ fromJSON(inputs.runs_on) }}
     timeout-minutes: 100
     env:
-        KERNEL: ${{ inputs.kernel }}
-        REPO_ROOT: ${{ github.workspace }}
-        REPO_PATH: ""
-        KBUILD_OUTPUT: ${{ github.workspace }}/kbuild-output
+        ARTIFACTS_ARCHIVE: "vmlinux-${{ inputs.arch }}-${{ inputs.toolchain_full }}.tar.zst"
         BASE_BRANCH: >-
           ${{ github.event_name == 'push' && github.ref_name
               || github.base_ref
               || 'bpf-next'
           }}
         BUILD_SCHED_EXT_SELFTESTS: ${{ inputs.arch == 'x86_64' || inputs.arch == 'aarch64' && 'true' || '' }}
+        KBUILD_OUTPUT: ${{ github.workspace }}/kbuild-output
+        KERNEL: ${{ inputs.kernel }}
+        REPO_PATH: ""
+        REPO_ROOT: ${{ github.workspace }}
     steps:
       - uses: actions/checkout@v4
         # We fetch an actual bit of history here to facilitate incremental
@@ -146,10 +147,10 @@ jobs:
           ARCHIVE_MAKE_HELPERS: ${{ github.repository != 'kernel-patches/bpf' && 'true' || '' }}
           ARCHIVE_SCHED_EXT_SELFTESTS: ${{ env.BUILD_SCHED_EXT_SELFTESTS }}
         with:
+          arch: ${{ inputs.arch }}
+          archive: ${{ env.ARTIFACTS_ARCHIVE }}
           kbuild-output: ${{ env.KBUILD_OUTPUT }}
           repo-root: ${{ env.REPO_ROOT }}
-          arch: ${{ inputs.arch }}
-          toolchain: ${{ inputs.toolchain_full }}
       - if: ${{ github.event_name != 'push' }}
         name: Remove KBUILD_OUTPUT content
         shell: bash
@@ -162,4 +163,4 @@ jobs:
         with:
           name: vmlinux-${{ inputs.arch }}-${{ inputs.toolchain_full }}${{ inputs.release && '-release' || '' }}
           if-no-files-found: error
-          path: ${{ steps.tar-artifacts.outputs.archive-name }}
+          path: ${{ env.ARTIFACTS_ARCHIVE }}