Skip to content

Commit d7904ae

Browse files
gastmaiergastmaier
committed
.github: top-level: Abstract away compiler version
Since the installed compilers depends on the runner version, abstract away its versions, as well as the cross-compile prefix. Signed-off-by: Jorge Marques <[email protected]>
1 parent ef7b4d8 commit d7904ae

File tree

1 file changed

+89
-109
lines changed

1 file changed

+89
-109
lines changed

‎.github/workflows/top-level.yml‎

Lines changed: 89 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -32,38 +32,36 @@ jobs:
3232
if: needs.checks.outputs.fatal != 'true'
3333
secrets: inherit
3434
with:
35-
CXX: "14"
36-
ARCH: "x86"
37-
DEFCONFIG: "adi_ci_defconfig"
35+
compiler: "gcc"
36+
arch: "x86"
37+
defconfig: "adi_ci_defconfig"
3838
build_llvm_x86_64:
3939
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
4040
needs: [checks]
4141
if: needs.checks.outputs.fatal != 'true'
4242
secrets: inherit
4343
with:
44-
LLVM: "19"
45-
ARCH: "x86"
46-
DEFCONFIG: "adi_ci_defconfig"
47-
CHECKS: true
44+
compiler: "llvm"
45+
arch: "x86"
46+
defconfig: "adi_ci_defconfig"
47+
checks: true
4848
build_gcc_aarch64:
4949
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
5050
needs: [checks]
5151
if: needs.checks.outputs.fatal != 'true'
5252
secrets: inherit
5353
with:
54-
CXX: "14"
55-
CROSS_COMPILE: "aarch64-suse-linux-"
56-
ARCH: "arm64"
57-
DEFCONFIG: "adi_ci_defconfig"
54+
compiler: "gcc"
55+
arch: "arm64"
56+
defconfig: "adi_ci_defconfig"
5857
build_gcc_arm:
5958
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
6059
secrets: inherit
6160
with:
62-
CXX: "14"
63-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
64-
ARCH: "arm"
65-
DEFCONFIG: "adi_ci_defconfig"
66-
CHECKS: true
61+
compiler: "gcc"
62+
arch: "arm"
63+
defconfig: "adi_ci_defconfig"
64+
checks: true
6765
assert_checks:
6866
runs-on: [self-hosted, v1]
6967
needs:
@@ -104,69 +102,63 @@ jobs:
104102
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
105103
secrets: inherit
106104
with:
107-
CXX: "14"
108-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
109-
ARCH: "arm"
110-
DEFCONFIG: "zynq_xcomm_adv7511_defconfig"
111-
AUTO_FROM_RANGE: false
105+
compiler: "gcc"
106+
arch: "arm"
107+
defconfig: "zynq_xcomm_adv7511_defconfig"
108+
auto_from_range: false
112109
build_gcc_arm_socfpga_adi_defconfig:
113110
needs: [conditional_xlnx]
114111
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
115112
secrets: inherit
116113
with:
117-
CXX: "14"
118-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
119-
ARCH: "arm"
120-
DEFCONFIG: "socfpga_adi_defconfig"
121-
AUTO_FROM_RANGE: false
114+
compiler: "gcc"
115+
arch: "arm"
116+
defconfig: "socfpga_adi_defconfig"
117+
auto_from_range: false
122118
build_gcc_arm_zynq_pluto_defconfig:
123119
needs: [conditional_xlnx]
124120
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
125121
secrets: inherit
126122
with:
127-
CXX: "14"
128-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
129-
ARCH: "arm"
130-
DEFCONFIG: "zynq_pluto_defconfig"
131-
AUTO_FROM_RANGE: false
123+
compiler: "gcc"
124+
arch: "arm"
125+
defconfig: "zynq_pluto_defconfig"
126+
auto_from_range: false
132127
build_gcc_arm_zynq_m2k_defconfig:
133128
needs: [conditional_xlnx]
134129
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
135130
secrets: inherit
136131
with:
137-
CXX: "14"
138-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
139-
ARCH: "arm"
140-
DEFCONFIG: "zynq_m2k_defconfig"
141-
AUTO_FROM_RANGE: false
132+
compiler: "gcc"
133+
arch: "arm"
134+
defconfig: "zynq_m2k_defconfig"
135+
auto_from_range: false
142136
build_gcc_aarch64_adi_zynqmp_defconfig:
143137
needs: [conditional_xlnx]
144138
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
145139
secrets: inherit
146140
with:
147-
CXX: "14"
148-
CROSS_COMPILE: "aarch64-suse-linux-"
149-
ARCH: "arm64"
150-
DEFCONFIG: "adi_zynqmp_defconfig"
151-
AUTO_FROM_RANGE: false
141+
compiler: "gcc"
142+
arch: "arm64"
143+
defconfig: "adi_zynqmp_defconfig"
144+
auto_from_range: false
152145
build_gcc_arm_adi_versal_defconfig:
153146
needs: [conditional_xlnx]
154147
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
155148
secrets: inherit
156149
with:
157-
CXX: "14"
158-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
159-
ARCH: "arm"
160-
DEFCONFIG: "adi_versal_defconfig"
161-
AUTO_FROM_RANGE: false
150+
compiler: "gcc"
151+
arch: "arm"
152+
defconfig: "adi_versal_defconfig"
153+
auto_from_range: false
162154
compile_devicetrees:
163155
needs: [conditional_xlnx]
164156
uses: analogdevicesinc/linux/.github/workflows/compile-devicetrees.yml@ci
165157
secrets: inherit
166158
with:
167-
CXX: "14"
168-
ARCHS: "arm arm64 microblaze nios2"
169-
DTS_FILES: >
159+
compiler: "gcc"
160+
archs: "arm arm64 microblaze nios2"
161+
dts_files: >
170162
arch/microblaze/boot/dts/*.dts
171163
arch/arm/boot/dts/xilinx/zynq-*.dts
172164
arch/arm/boot/dts/intel/socfpga/socfpga_*.dts
@@ -218,51 +210,46 @@ jobs:
218210
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
219211
secrets: inherit
220212
with:
221-
CXX: "14"
222-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
223-
ARCH: "arm"
224-
DEFCONFIG: "adi_bcm2709_defconfig"
225-
AUTO_FROM_RANGE: false
213+
compiler: "gcc"
214+
arch: "arm"
215+
defconfig: "adi_bcm2709_defconfig"
216+
auto_from_range: false
226217
build_gcc_arm_adi_bcm2711_defconfig:
227218
needs: [conditional_rpi]
228219
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
229220
secrets: inherit
230221
with:
231-
CXX: "14"
232-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
233-
ARCH: "arm"
234-
DEFCONFIG: "adi_bcm2711_defconfig"
235-
AUTO_FROM_RANGE: false
222+
compiler: "gcc"
223+
arch: "arm"
224+
defconfig: "adi_bcm2711_defconfig"
225+
auto_from_range: false
236226
build_gcc_arm_adi_bcmrpi_defconfig:
237227
needs: [conditional_rpi]
238228
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
239229
secrets: inherit
240230
with:
241-
CXX: "14"
242-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
243-
ARCH: "arm"
244-
DEFCONFIG: "adi_bcmrpi_defconfig"
245-
AUTO_FROM_RANGE: false
231+
compiler: "gcc"
232+
arch: "arm"
233+
defconfig: "adi_bcmrpi_defconfig"
234+
auto_from_range: false
246235
build_gcc_aarch64_adi_bcm2711_defconfig:
247236
needs: [conditional_rpi]
248237
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
249238
secrets: inherit
250239
with:
251-
CXX: "14"
252-
CROSS_COMPILE: "aarch64-suse-linux-"
253-
ARCH: "arm64"
254-
DEFCONFIG: "adi_bcm2711_defconfig"
255-
AUTO_FROM_RANGE: false
240+
compiler: "gcc"
241+
arch: "arm64"
242+
defconfig: "adi_bcm2711_defconfig"
243+
auto_from_range: false
256244
build_gcc_aarch64_adi_bcm2712_defconfig:
257245
needs: [conditional_rpi]
258246
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
259247
secrets: inherit
260248
with:
261-
CXX: "14"
262-
CROSS_COMPILE: "aarch64-suse-linux-"
263-
ARCH: "arm64"
264-
DEFCONFIG: "adi_bcm2712_defconfig"
265-
AUTO_FROM_RANGE: false
249+
compiler: "gcc"
250+
arch: "arm64"
251+
defconfig: "adi_bcm2712_defconfig"
252+
auto_from_range: false
266253
assert_build_rpi:
267254
runs-on: [self-hosted, v1]
268255
needs:
@@ -302,61 +289,55 @@ jobs:
302289
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
303290
secrets: inherit
304291
with:
305-
CXX: "14"
306-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
307-
ARCH: "arm"
308-
DEFCONFIG: "sc573-ezkit_defconfig"
309-
AUTO_FROM_RANGE: false
292+
compiler: "gcc"
293+
arch: "arm"
294+
defconfig: "sc573-ezkit_defconfig"
295+
auto_from_range: false
310296
build_gcc_arm_sc589-mini_defconfig:
311297
needs: [conditional_adsp]
312298
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
313299
secrets: inherit
314300
with:
315-
CXX: "14"
316-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
317-
ARCH: "arm"
318-
DEFCONFIG: "sc589-mini_defconfig"
319-
AUTO_FROM_RANGE: false
301+
compiler: "gcc"
302+
arch: "arm"
303+
defconfig: "sc589-mini_defconfig"
304+
auto_from_range: false
320305
build_gcc_arm_sc594-som-ezkit_defconfig:
321306
needs: [conditional_adsp]
322307
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
323308
secrets: inherit
324309
with:
325-
CXX: "14"
326-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
327-
ARCH: "arm"
328-
DEFCONFIG: "sc594-som-ezkit_defconfig"
329-
AUTO_FROM_RANGE: false
310+
compiler: "gcc"
311+
arch: "arm"
312+
defconfig: "sc594-som-ezkit_defconfig"
313+
auto_from_range: false
330314
build_gcc_arm_sc594-som-ezlite_defconfig:
331315
needs: [conditional_adsp]
332316
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
333317
secrets: inherit
334318
with:
335-
CXX: "14"
336-
CROSS_COMPILE: "arm-suse-linux-gnueabi-"
337-
ARCH: "arm"
338-
DEFCONFIG: "sc594-som-ezlite_defconfig"
339-
AUTO_FROM_RANGE: false
319+
compiler: "gcc"
320+
arch: "arm"
321+
defconfig: "sc594-som-ezlite_defconfig"
322+
auto_from_range: false
340323
build_gcc_aarch64_sc598-som-ezkit_defconfig:
341324
needs: [conditional_adsp]
342325
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
343326
secrets: inherit
344327
with:
345-
CXX: "14"
346-
CROSS_COMPILE: "aarch64-suse-linux-"
347-
ARCH: "arm64"
348-
DEFCONFIG: "sc598-som-ezkit_defconfig"
349-
AUTO_FROM_RANGE: false
328+
compiler: "gcc"
329+
arch: "arm64"
330+
defconfig: "sc598-som-ezkit_defconfig"
331+
auto_from_range: false
350332
build_gcc_aarch64_sc598-som-ezlite_defconfig:
351333
needs: [conditional_adsp]
352334
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
353335
secrets: inherit
354336
with:
355-
CXX: "14"
356-
CROSS_COMPILE: "aarch64-suse-linux-"
357-
ARCH: "arm64"
358-
DEFCONFIG: "sc598-som-ezlite_defconfig"
359-
AUTO_FROM_RANGE: false
337+
compiler: "gcc"
338+
arch: "arm64"
339+
defconfig: "sc598-som-ezlite_defconfig"
340+
auto_from_range: false
360341
assert_build_adsp:
361342
runs-on: [self-hosted, v1]
362343
needs:
@@ -399,11 +380,10 @@ jobs:
399380
uses: analogdevicesinc/linux/.github/workflows/build.yml@ci
400381
secrets: inherit
401382
with:
402-
CXX: "14"
403-
CROSS_COMPILE: "aarch64-suse-linux-"
404-
ARCH: "arm64"
405-
DEFCONFIG: "adrv906x-eval_defconfig"
406-
AUTO_FROM_RANGE: false
383+
compiler: "gcc"
384+
arch: "arm64"
385+
defconfig: "adrv906x-eval_defconfig"
386+
auto_from_range: false
407387
assert_build_oran:
408388
runs-on: [self-hosted, v1]
409389
needs:

0 commit comments

Comments
 (0)