Skip to content

Commit 74e70b8

Browse files
nathanchancenathanchance
authored
Merge pull request #848 from nathanchance/update-arm-builds-llvm-android
Update Android LLVM ARM builds
2 parents fffb571 + dd0a37f commit 74e70b8

File tree

4 files changed

+76
-37
lines changed

4 files changed

+76
-37
lines changed

‎.github/workflows/next-clang-android.yml

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@ jobs:
117117
name: boot_utils_json_defconfigs
118118
- name: Check Build and Boot Logs
119119
run: scripts/check-logs.py
120-
_a82d5da76edb25de07265b1189803b21:
120+
_3a8b38a1ee16a0b8441c7dda2a3d6573:
121121
runs-on: ubuntu-latest
122122
needs:
123123
- kick_tuxsuite_defconfigs
124124
- check_cache
125125
- check_patches
126-
name: ARCH=arm LLVM=1 LLVM_IAS=0 LLVM_VERSION=android aspeed_g5_defconfig
126+
name: ARCH=arm LLVM=1 LLVM_IAS=1 LLVM_VERSION=android aspeed_g5_defconfig
127127
if: ${{ needs.check_cache.outputs.status != 'pass' }}
128128
env:
129129
ARCH: arm
@@ -508,13 +508,13 @@ jobs:
508508
path: boot-utils.json
509509
name: boot_utils_json_allconfigs
510510
if-no-files-found: error
511-
_5c6a45dfab4397855db83c0803300b23:
511+
_05b4b5316e0115835ded8a6f9865a052:
512512
runs-on: ubuntu-latest
513513
needs:
514514
- kick_tuxsuite_allconfigs
515515
- check_cache
516516
- check_patches
517-
name: ARCH=arm BOOT=0 LLVM=1 LLVM_IAS=0 LLVM_VERSION=android allmodconfig+CONFIG_WERROR=n+CONFIG_DRM_WERROR=n
517+
name: ARCH=arm BOOT=0 LLVM=1 LLVM_IAS=1 LLVM_VERSION=android allmodconfig+CONFIG_WERROR=n+CONFIG_DRM_WERROR=n
518518
if: ${{ needs.check_cache.outputs.status != 'pass' }}
519519
env:
520520
ARCH: arm
@@ -566,6 +566,35 @@ jobs:
566566
name: boot_utils_json_allconfigs
567567
- name: Check Build and Boot Logs
568568
run: scripts/check-logs.py
569+
_245638df4b978821d25a986e495eb7b3:
570+
runs-on: ubuntu-latest
571+
needs:
572+
- kick_tuxsuite_allconfigs
573+
- check_cache
574+
- check_patches
575+
name: ARCH=arm BOOT=0 LLVM=1 LLVM_IAS=1 LLVM_VERSION=android allyesconfig+CONFIG_WERROR=n+CONFIG_DRM_WERROR=n
576+
if: ${{ needs.check_cache.outputs.status != 'pass' }}
577+
env:
578+
ARCH: arm
579+
LLVM_VERSION: android
580+
BOOT: 0
581+
CONFIG: allyesconfig+CONFIG_WERROR=n+CONFIG_DRM_WERROR=n
582+
REPO_SCOPED_PAT: ${{ secrets.REPO_SCOPED_PAT }}
583+
container:
584+
image: ghcr.io/clangbuiltlinux/qemu
585+
options: --ipc=host
586+
steps:
587+
- uses: actions/checkout@v4
588+
with:
589+
submodules: true
590+
- uses: actions/download-artifact@v4
591+
with:
592+
name: output_artifact_allconfigs
593+
- uses: actions/download-artifact@v4
594+
with:
595+
name: boot_utils_json_allconfigs
596+
- name: Check Build and Boot Logs
597+
run: scripts/check-logs.py
569598
_0a2662d69f899d9d4f0fecc38bed6d41:
570599
runs-on: ubuntu-latest
571600
needs:

‎generator/yml/0009-llvm-11.yml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -207,34 +207,3 @@
207207
- {<< : *x86_64_allmod, << : *stable-5_10, << : *llvm_full, boot: false, << : *llvm_11}
208208
- {<< : *x86_64_allno, << : *stable-5_10, << : *llvm_full, boot: false, << : *llvm_11}
209209
- {<< : *x86_64_allyes, << : *stable-5_10, << : *llvm_full, boot: false, << : *llvm_11}
210-
##################
211-
# Android LLVM #
212-
##################
213-
##########
214-
# Next #
215-
##########
216-
- {<< : *arm32_v5, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
217-
- {<< : *arm32_v6, << : *next, << : *llvm, boot: true, << : *llvm_android}
218-
- {<< : *arm32_v7, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
219-
- {<< : *arm32_v7_t, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
220-
- {<< : *arm32_allmod, << : *next, << : *llvm, boot: false, << : *llvm_android}
221-
- {<< : *arm32_allno, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
222-
# ARM allyesconfig build disabled: https://github.com/ClangBuiltLinux/linux/issues/1615
223-
# - {<< : *arm32_allyes, << : *next, << : *llvm, boot: false, << : *llvm_android}
224-
- {<< : *arm64, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
225-
- {<< : *arm64be, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
226-
- {<< : *arm64_lto_full, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
227-
- {<< : *arm64_lto_thin, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
228-
- {<< : *arm64_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
229-
- {<< : *arm64_allmod_lto, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
230-
- {<< : *arm64_allno, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
231-
- {<< : *arm64_allyes, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
232-
- {<< : *i386, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
233-
- {<< : *x86_64, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
234-
- {<< : *x86_64_lto_full, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
235-
- {<< : *x86_64_lto_thin, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
236-
- {<< : *x86_64_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
237-
- {<< : *x86_64_allmod_lto, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
238-
- {<< : *x86_64_allno, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
239-
- {<< : *x86_64_allyes, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
240-
- {<< : *x86_64_gcov, << : *next, << : *llvm_full, boot: true, << : *llvm_android}

‎generator/yml/0009-llvm-android.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
##################
2+
# Android LLVM #
3+
##################
4+
##########
5+
# Next #
6+
##########
7+
- {<< : *arm32_v5, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
8+
- {<< : *arm32_v6, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
9+
- {<< : *arm32_v7, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
10+
- {<< : *arm32_v7_t, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
11+
- {<< : *arm32_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
12+
- {<< : *arm32_allno, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
13+
- {<< : *arm32_allyes, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
14+
- {<< : *arm64, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
15+
- {<< : *arm64be, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
16+
- {<< : *arm64_lto_full, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
17+
- {<< : *arm64_lto_thin, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
18+
- {<< : *arm64_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
19+
- {<< : *arm64_allmod_lto, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
20+
- {<< : *arm64_allno, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
21+
- {<< : *arm64_allyes, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
22+
- {<< : *i386, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
23+
- {<< : *x86_64, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
24+
- {<< : *x86_64_lto_full, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
25+
- {<< : *x86_64_lto_thin, << : *next, << : *llvm_full, boot: true, << : *llvm_android}
26+
- {<< : *x86_64_allmod, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
27+
- {<< : *x86_64_allmod_lto, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
28+
- {<< : *x86_64_allno, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
29+
- {<< : *x86_64_allyes, << : *next, << : *llvm_full, boot: false, << : *llvm_android}
30+
- {<< : *x86_64_gcov, << : *next, << : *llvm_full, boot: true, << : *llvm_android}

‎tuxsuite/next-clang-android.tux.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- dtbs
3030
make_variables:
3131
LLVM: 1
32-
LLVM_IAS: 0
32+
LLVM_IAS: 1
3333
- target_arch: arm
3434
toolchain: clang-android
3535
kconfig: multi_v7_defconfig
@@ -145,7 +145,7 @@ jobs:
145145
- default
146146
make_variables:
147147
LLVM: 1
148-
LLVM_IAS: 0
148+
LLVM_IAS: 1
149149
- target_arch: arm
150150
toolchain: clang-android
151151
kconfig: allnoconfig
@@ -154,6 +154,17 @@ jobs:
154154
make_variables:
155155
LLVM: 1
156156
LLVM_IAS: 1
157+
- target_arch: arm
158+
toolchain: clang-android
159+
kconfig:
160+
- allyesconfig
161+
- CONFIG_WERROR=n
162+
- CONFIG_DRM_WERROR=n
163+
targets:
164+
- default
165+
make_variables:
166+
LLVM: 1
167+
LLVM_IAS: 1
157168
- target_arch: arm64
158169
toolchain: clang-android
159170
kconfig: allmodconfig

0 commit comments

Comments
 (0)