Skip to content

Commit bdfe078

Browse files
committed
ci,build: apply patches via explicit variable
Each CI (Travis-CI, Github Actions, Azure Pipelines) defines their own environment variable set. Instead of checking for each CI, define our own env var to apply the patches for the DTB build test. Signed-off-by: Alexandru Ardelean <alexandru.ardelean@analog.com>
1 parent e548f65 commit bdfe078

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
runs-on: ubuntu-latest
3939
env:
4040
BUILD_TYPE: dtb_build_test
41+
APPLY_DTB_BUILD_PATCHES: true
4142
DTS_FILES: "arch/arm/boot/dts/zynq-*.dts
4243
arch/arm/boot/dts/socfpga_*.dts
4344
arch/arm64/boot/dts/xilinx/zynqmp-*.dts

.travis.yml.bak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ matrix:
2020
- checkpatch: 1
2121
env: BUILD_TYPE=checkpatch DO_NOT_DOCKERIZE=1
2222
- env: BUILD_TYPE=dtb_build_test DO_NOT_DOCKERIZE=1
23+
APPLY_DTB_BUILD_PATCHES="true"
2324
DTS_FILES="arch/arm/boot/dts/zynq-*.dts
2425
arch/arm/boot/dts/socfpga_*.dts
2526
arch/arm64/boot/dts/xilinx/zynqmp-*.dts

ci/travis/run-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ build_dtb_build_test() {
277277
local err=0
278278
local last_arch
279279

280-
if [ "$TRAVIS" = "true" ] || [ "$CI" = "true" ] ; then
280+
if [ "$APPLY_DTB_BUILD_PATCHES" = "true" ] ; then
281281
for patch in $(ls ci/travis/*.patch | sort) ; do
282282
patch -p1 < $patch
283283
done

0 commit comments

Comments
 (0)