Skip to content

Commit 03cbb58

Browse files
committed
Try to prevent harder buildbot failures
Merging pull request #14218 (with all 190 CI checks green) resulted in buildbot failures in `Kernel/CollectDebug` step, likely due to the fact, that CI builds don't use same config options as on buildbot, specifically CI builds currently don't have `COLLECT_KERNEL_DEBUG` config option enabled. So lets try to prevent those regressions in the future by aligning the CI build process with the build config options used later on the buildbots. References: 066b0fee7668 ("kernel: copy only *.ko for debug info") References: openwrt/openwrt#14218 Signed-off-by: Petr Štetiar <ynezz@true.cz>
1 parent 310b749 commit 03cbb58

File tree

4 files changed

+36
-0
lines changed

4 files changed

+36
-0
lines changed

.github/workflows/label-target.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ jobs:
3535
target: ${{ needs.set_target.outputs.target }}
3636
subtarget: ${{ needs.set_target.outputs.subtarget }}
3737
build_full: true
38+
build_ib_sdk: true
39+
build_bpf_toolchain: true
3840
build_all_kmods: true
3941
build_all_boards: true
4042
build_all_modules: true

.github/workflows/packages.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ jobs:
7777
build_all_kmods: true
7878
build_all_modules: true
7979
build_full: true
80+
build_ib_sdk: true
81+
build_bpf_toolchain: true
8082
ccache_type: packages
8183
upload_ccache_cache: ${{ github.repository_owner == 'openwrt' }}
8284
check_packages_list: ${{ needs.determine_changed_packages.outputs.changed_packages }}

.github/workflows/reusable_build.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ on:
3333
type: boolean
3434
build_all_boards:
3535
type: boolean
36+
build_ib_sdk:
37+
type: boolean
38+
build_bpf_toolchain:
39+
type: boolean
3640
use_openwrt_container:
3741
type: boolean
3842
default: true
@@ -447,6 +451,33 @@ jobs:
447451
run: |
448452
echo CONFIG_KERNEL_WERROR=y >> .config
449453
454+
- name: Configure various options which are used on buildbots
455+
shell: su buildbot -c "sh -e {0}"
456+
working-directory: openwrt
457+
run: |
458+
echo CONFIG_JSON_CYCLONEDX_SBOM=y >> .config
459+
echo CONFIG_COLLECT_KERNEL_DEBUG=y >> .config
460+
echo CONFIG_REPRODUCIBLE_DEBUG_INFO=y >> .config
461+
echo CONFIG_KERNEL_BUILD_USER="builder" >> .config
462+
echo CONFIG_KERNEL_BUILD_DOMAIN="buildhost" >> .config
463+
464+
- name: Configure BPF options as used on buildbots
465+
shell: su buildbot -c "sh -e {0}"
466+
if: inputs.build_bpf_toolchain == true
467+
working-directory: openwrt
468+
run: |
469+
echo CONFIG_DEVEL=y >> .config
470+
echo CONFIG_SDK_LLVM_BPF=y >> .config
471+
echo CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y >> .config
472+
473+
- name: Configure SDK and IB options used on buildbots
474+
shell: su buildbot -c "sh -e {0}"
475+
if: inputs.build_ib_sdk == true
476+
working-directory: openwrt
477+
run: |
478+
echo CONFIG_IB=y >> .config
479+
echo CONFIG_SDK=y >> .config
480+
450481
- name: Configure all kernel modules
451482
if: inputs.build_all_kmods == true
452483
shell: su buildbot -c "sh -e {0}"

.github/workflows/toolchain.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,3 +53,4 @@ jobs:
5353
target: ${{ matrix.target }}
5454
subtarget: ${{ matrix.subtarget }}
5555
build_toolchain: true
56+
build_bpf_toolchain: true

0 commit comments

Comments
 (0)