Skip to content

Commit 25cc022

Browse files
authored
Merge pull request #824 from nathanchance/android-mainline-drop-arm-clang-13
Apply 96dc364 to android-mainline
2 parents fe4844a + 4125642 commit 25cc022

File tree

3 files changed

+3
-86
lines changed

3 files changed

+3
-86
lines changed

.github/workflows/android-mainline-clang-13.yml

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -175,76 +175,4 @@ jobs:
175175
name: boot_utils_json_defconfigs
176176
- name: Check Build and Boot Logs
177177
run: scripts/check-logs.py
178-
kick_tuxsuite_allconfigs:
179-
name: TuxSuite (allconfigs)
180-
runs-on: ubuntu-latest
181-
container: tuxsuite/tuxsuite
182-
needs:
183-
- check_cache
184-
- check_patches
185-
env:
186-
TUXSUITE_TOKEN: ${{ secrets.TUXSUITE_TOKEN }}
187-
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
188-
timeout-minutes: 480
189-
steps:
190-
- name: Checking Cache Pass
191-
if: ${{ needs.check_cache.outputs.output == 'success' && github.event_name != 'workflow_dispatch' && needs.check_cache.outputs.status == 'pass' }}
192-
run: echo 'Cache HIT on previously PASSED build. Passing this build to avoid redundant work.' && exit 0
193-
- name: Checking Cache Fail
194-
if: ${{ needs.check_cache.outputs.output == 'success' && github.event_name != 'workflow_dispatch' && needs.check_cache.outputs.status == 'fail' }}
195-
run: echo 'Cache HIT on previously FAILED build. Failing this build to avoid redundant work.' && exit 1
196-
- uses: actions/checkout@v4
197-
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
198-
- name: tuxsuite
199-
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
200-
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
201-
- name: Update Cache Build Status
202-
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
203-
run: python caching/update.py
204-
- name: save builds.json
205-
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
206-
uses: actions/upload-artifact@v4
207-
with:
208-
path: builds.json
209-
name: output_artifact_allconfigs
210-
if-no-files-found: error
211-
- name: generate boot-utils.json
212-
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
213-
run: python3 scripts/generate-boot-utils-json.py ${{ secrets.GITHUB_TOKEN }}
214-
- name: save boot-utils.json
215-
if: ${{ needs.check_cache.outputs.output == 'failure' || github.event_name == 'workflow_dispatch' }}
216-
uses: actions/upload-artifact@v4
217-
with:
218-
path: boot-utils.json
219-
name: boot_utils_json_allconfigs
220-
if-no-files-found: error
221-
_2309c816a58459d87da53f6d2074f5d8:
222-
runs-on: ubuntu-latest
223-
needs:
224-
- kick_tuxsuite_allconfigs
225-
- check_cache
226-
- check_patches
227-
name: ARCH=arm BOOT=0 LLVM=1 LLVM_IAS=1 LLVM_VERSION=13 allmodconfig+CONFIG_WERROR=n+CONFIG_DRM_WERROR=n
228-
if: ${{ needs.check_cache.outputs.status != 'pass' }}
229-
env:
230-
ARCH: arm
231-
LLVM_VERSION: 13
232-
BOOT: 0
233-
CONFIG: allmodconfig+CONFIG_WERROR=n+CONFIG_DRM_WERROR=n
234-
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
235-
container:
236-
image: ghcr.io/clangbuiltlinux/qemu
237-
options: --ipc=host
238-
steps:
239-
- uses: actions/checkout@v4
240-
with:
241-
submodules: true
242-
- uses: actions/download-artifact@v4
243-
with:
244-
name: output_artifact_allconfigs
245-
- uses: actions/download-artifact@v4
246-
with:
247-
name: boot_utils_json_allconfigs
248-
- name: Check Build and Boot Logs
249-
run: scripts/check-logs.py
250178

generator/yml/0009-llvm-13.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,9 @@
460460
#############
461461
# Android #
462462
#############
463-
- {<< : *arm32_allmod, << : *android-mainline, << : *llvm_full, boot: false, << : *llvm_13}
463+
# BPF uses check_mul_overflow() with a 'long long' value, which is broken prior to clang-14:
464+
# https://github.com/llvm/llvm-project/commit/5c91b98c5d45243352bf10262454bcac77cd3fed
465+
# - {<< : *arm32_allmod, << : *android-mainline, << : *llvm_full, boot: false, << : *llvm_13}
464466
- {<< : *arm32_v7_t, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_13}
465467
- {<< : *arm64_gki, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_13}
466468
- {<< : *x86_64_gki, << : *android-mainline, << : *llvm_full, boot: true, << : *llvm_13}

tuxsuite/android-mainline-clang-13.tux.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,4 @@ jobs:
4343
make_variables:
4444
LLVM: 1
4545
LLVM_IAS: 1
46-
- name: allconfigs
47-
builds:
48-
- target_arch: arm
49-
toolchain: korg-clang-13
50-
kconfig:
51-
- allmodconfig
52-
- CONFIG_WERROR=n
53-
- CONFIG_DRM_WERROR=n
54-
targets:
55-
- default
56-
make_variables:
57-
LLVM: 1
58-
LLVM_IAS: 1
5946

0 commit comments

Comments
 (0)