From 562d2811472a5c34848a2986ee40afb14a82631c Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Mon, 7 Apr 2025 11:25:04 -0700 Subject: [PATCH 1/2] generator: yml: Apply 96dc364d483bc12ab6f49bd9c214b639497d6198 to android-mainline Signed-off-by: Nathan Chancellor --- generator/yml/0009-llvm-13.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/generator/yml/0009-llvm-13.yml b/generator/yml/0009-llvm-13.yml index df0144e1..e47f715a 100644 --- a/generator/yml/0009-llvm-13.yml +++ b/generator/yml/0009-llvm-13.yml @@ -460,7 +460,9 @@ ############# # Android # ############# - - {<< : *arm32_allmod, << : *android-mainline, << : *llvm_full, boot: false, << : *llvm_13} + # BPF uses check_mul_overflow() with a 'long long' value, which is broken prior to clang-14: + # https://github.com/llvm/llvm-project/commit/5c91b98c5d45243352bf10262454bcac77cd3fed + # - {<< : *arm32_allmod, << : *android-mainline, << : *llvm_full, boot: false, << : *llvm_13} - {<< : *arm32_v7_t, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_13} - {<< : *arm64_gki, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_13} - {<< : *x86_64_gki, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_13} From 4125642f35224614df1a8efb6480edd6f8f4cb6b Mon Sep 17 00:00:00 2001 From: Nathan Chancellor Date: Mon, 7 Apr 2025 12:52:18 -0700 Subject: [PATCH 2/2] ci: Regenerate GitHub Actions workflow and TuxSuite files Signed-off-by: Nathan Chancellor --- .../workflows/android-mainline-clang-13.yml | 72 ------------------- tuxsuite/android-mainline-clang-13.tux.yml | 13 ---- 2 files changed, 85 deletions(-) diff --git a/.github/workflows/android-mainline-clang-13.yml b/.github/workflows/android-mainline-clang-13.yml index 1df096bf..960d1190 100644 --- a/.github/workflows/android-mainline-clang-13.yml +++ b/.github/workflows/android-mainline-clang-13.yml @@ -175,76 +175,4 @@ jobs: name: boot_utils_json_defconfigs - name: Check Build and Boot Logs run: scripts/check-logs.py - kick_tuxsuite_allconfigs: - name: TuxSuite (allconfigs) - runs-on: ubuntu-latest - container: tuxsuite/tuxsuite - needs: - - check_cache - - check_patches - env: - TUXSUITE_TOKEN: ${{ secrets.TUXSUITE_TOKEN }} - REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }} - timeout-minutes: 480 - steps: - - name: Checking Cache Pass - if: ${{ needs.check_cache.outputs.output == 'success' && github.event_name != 'workflow_dispatch' && needs.check_cache.outputs.status == 'pass' }} - run: echo 'Cache HIT on previously PASSED build. Passing this build to avoid redundant work.' && exit 0 - - name: Checking Cache Fail - if: ${{ needs.check_cache.outputs.output == 'success' && github.event_name != 'workflow_dispatch' && needs.check_cache.outputs.status == 'fail' }} - run: echo 'Cache HIT on previously FAILED build. Failing this build to avoid redundant work.' && exit 1 - - uses: actions/checkout@v4 - if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - - name: tuxsuite - if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: tuxsuite plan --git-repo https://android.googlesource.com/kernel/common.git --git-ref android-mainline --job-name allconfigs --json-out builds.json --patch-series patches/android-mainline tuxsuite/android-mainline-clang-13.tux.yml || true - - name: Update Cache Build Status - if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: python caching/update.py - - name: save builds.json - if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - uses: actions/upload-artifact@v4 - with: - path: builds.json - name: output_artifact_allconfigs - if-no-files-found: error - - name: generate boot-utils.json - if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - run: python3 scripts/generate-boot-utils-json.py ${{ secrets.GITHUB_TOKEN }} - - name: save boot-utils.json - if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }} - uses: actions/upload-artifact@v4 - with: - path: boot-utils.json - name: boot_utils_json_allconfigs - if-no-files-found: error - _2309c816a58459d87da53f6d2074f5d8: - runs-on: ubuntu-latest - needs: - - kick_tuxsuite_allconfigs - - check_cache - - check_patches - name: ARCH=arm BOOT=0 LLVM=1 LLVM_IAS=1 LLVM_VERSION=13 allmodconfig+CONFIG_WERROR=n+CONFIG_DRM_WERROR=n - if: ${{ needs.check_cache.outputs.status != 'pass' }} - env: - ARCH: arm - LLVM_VERSION: 13 - BOOT: 0 - CONFIG: allmodconfig+CONFIG_WERROR=n+CONFIG_DRM_WERROR=n - REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }} - container: - image: ghcr.io/clangbuiltlinux/qemu - options: --ipc=host - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - uses: actions/download-artifact@v4 - with: - name: output_artifact_allconfigs - - uses: actions/download-artifact@v4 - with: - name: boot_utils_json_allconfigs - - name: Check Build and Boot Logs - run: scripts/check-logs.py diff --git a/tuxsuite/android-mainline-clang-13.tux.yml b/tuxsuite/android-mainline-clang-13.tux.yml index 03c589b1..aaa28988 100644 --- a/tuxsuite/android-mainline-clang-13.tux.yml +++ b/tuxsuite/android-mainline-clang-13.tux.yml @@ -43,17 +43,4 @@ jobs: make_variables: LLVM: 1 LLVM_IAS: 1 -- name: allconfigs - builds: - - target_arch: arm - toolchain: korg-clang-13 - kconfig: - - allmodconfig - - CONFIG_WERROR=n - - CONFIG_DRM_WERROR=n - targets: - - default - make_variables: - LLVM: 1 - LLVM_IAS: 1