Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-20 11:55:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

travis/gitlab/azure: Use -W to avoid warnings check

Browse source 
We can use the -W flag to tell buildman to ignore warnings. Since we also
have -E defined, compiler warnings are promoted to errors, so they will
still cause a failure. But migration warnings of the form:

    ===================== WARNING ======================
    This board does not use CONFIG_DM. CONFIG_DM will be
    compulsory starting with the v2020.01 release.
    Failure to update may result in board removal.
    See doc/driver-model/migration.rst for more info.

will now be ignored.

Signed-off-by: Simon Glass <sjg@chromium.org>
Fixes: 329f5ef51d (travis.yml: run buildman with option -E)
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2020-03-18 09:42:57 -06:00 • committed by Tom Rini
parent 4080d0970d
commit dd5c954e91
3 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.azure-pipelines.yml
View file

@ -266,8 +266,8 @@ jobs:
cd ${WORK_DIR} cd ${WORK_DIR}
export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD}; export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD};
ret=0; ret=0;
tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?; tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then if [[ $ret -ne 0 ]]; then
tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -se --board ${TEST_PY_BD}; tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -se --board ${TEST_PY_BD};
exit $ret; exit $ret;
fi fi
@ -415,8 +415,8 @@ jobs:
cat << "EOF" >> build.sh cat << "EOF" >> build.sh
if [[ "${BUILDMAN}" != "" ]]; then if [[ "${BUILDMAN}" != "" ]]; then
ret=0; ret=0;
tools/buildman/buildman -o /tmp -P -E ${BUILDMAN} ${OVERRIDE} || ret=$?; tools/buildman/buildman -o /tmp -P -W ${BUILDMAN} ${OVERRIDE} || ret=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then if [[ $ret -ne 0 ]]; then
tools/buildman/buildman -o /tmp -seP ${BUILDMAN}; tools/buildman/buildman -o /tmp -seP ${BUILDMAN};
exit $ret; exit $ret;
fi; fi;

23
.gitlab-ci.yml
View file

@ -36,13 +36,12 @@ stages:
after_script: after_script:
- rm -rf /tmp/uboot-test-hooks /tmp/venv - rm -rf /tmp/uboot-test-hooks /tmp/venv
script: script:
# From buildman, exit code 129 means warnings only. If we've been asked to # If we've been asked to use clang only do one configuration.
# use clang only do one configuration.
- export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD} - export UBOOT_TRAVIS_BUILD_DIR=/tmp/${TEST_PY_BD}
- ret=0; - ret=0;
tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W
--board ${TEST_PY_BD} ${OVERRIDE} || ret=$?; --board ${TEST_PY_BD} ${OVERRIDE} || ret=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then if [[ $ret -ne 0 ]]; then
tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -se tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -se
--board ${TEST_PY_BD}; --board ${TEST_PY_BD};
exit $ret; exit $ret;
@ -66,8 +65,8 @@ build all 32bit ARM platforms:
stage: world build stage: world build
script: script:
- ret=0; - ret=0;
./tools/buildman/buildman -o /tmp -P -E arm -x aarch64 || ret=$?; ./tools/buildman/buildman -o /tmp -P -E -W arm -x aarch64 || ret=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then if [[ $ret -ne 0 ]]; then
./tools/buildman/buildman -o /tmp -seP; ./tools/buildman/buildman -o /tmp -seP;
exit $ret; exit $ret;
fi; fi;
@ -80,8 +79,8 @@ build all 64bit ARM platforms:
- . /tmp/venv/bin/activate - . /tmp/venv/bin/activate
- pip install pyelftools - pip install pyelftools
- ret=0; - ret=0;
./tools/buildman/buildman -o /tmp -P -E aarch64 || ret=$?; ./tools/buildman/buildman -o /tmp -P -E -W aarch64 || ret=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then if [[ $ret -ne 0 ]]; then
./tools/buildman/buildman -o /tmp -seP; ./tools/buildman/buildman -o /tmp -seP;
exit $ret; exit $ret;
fi; fi;
@ -91,8 +90,8 @@ build all PowerPC platforms:
stage: world build stage: world build
script: script:
- ret=0; - ret=0;
./tools/buildman/buildman -o /tmp -P -E powerpc || ret=$?; ./tools/buildman/buildman -o /tmp -P -E -W powerpc || ret=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then if [[ $ret -ne 0 ]]; then
./tools/buildman/buildman -o /tmp -seP; ./tools/buildman/buildman -o /tmp -seP;
exit $ret; exit $ret;
fi; fi;
@ -102,8 +101,8 @@ build all other platforms:
stage: world build stage: world build
script: script:
- ret=0; - ret=0;
./tools/buildman/buildman -o /tmp -P -E -x arm,powerpc || ret=$?; ./tools/buildman/buildman -o /tmp -P -E -W -x arm,powerpc || ret=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then if [[ $ret -ne 0 ]]; then
./tools/buildman/buildman -o /tmp -seP; ./tools/buildman/buildman -o /tmp -seP;
exit $ret; exit $ret;
fi; fi;

13
.travis.yml
View file

@ -204,13 +204,12 @@ script:
# Comments must be outside the command strings below, or the Travis parser # Comments must be outside the command strings below, or the Travis parser
# will get confused. # will get confused.
# #
# From buildman, exit code 129 means warnings only. If we've been asked to # If we've been asked to use clang only do one configuration.
# use clang only do one configuration. #
# Build a selection of boards if TEST_PY_BD is empty # Build a selection of boards if TEST_PY_BD is empty
- if [[ "${BUILDMAN}" != "" ]]; then - if [[ "${BUILDMAN}" != "" ]]; then
ret=0; tools/buildman/buildman -P -E -W ${BUILDMAN} ${OVERRIDE};
tools/buildman/buildman -P -E ${BUILDMAN} ${OVERRIDE}|| ret=$?; if [[ $ret -ne 0 ]]; then
if [[ $ret -ne 0 && $ret -ne 129 ]]; then
tools/buildman/buildman -seP ${BUILDMAN}; tools/buildman/buildman -seP ${BUILDMAN};
exit $ret; exit $ret;
fi; fi;
@ -234,9 +233,9 @@ script:
cp ~/grub_riscv64.efi $UBOOT_TRAVIS_BUILD_DIR/; cp ~/grub_riscv64.efi $UBOOT_TRAVIS_BUILD_DIR/;
fi; fi;
ret=0; ret=0;
tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E tools/buildman/buildman -o ${UBOOT_TRAVIS_BUILD_DIR} -w -E -W
--board ${TEST_PY_BD} ${OVERRIDE}|| ret=$?; --board ${TEST_PY_BD} ${OVERRIDE}|| ret=$?;
if [[ $ret -ne 0 && $ret -ne 129 ]]; then if [[ $ret -ne 0 ]]; then
tools/buildman/buildman -se -o ${UBOOT_TRAVIS_BUILD_DIR} -w tools/buildman/buildman -se -o ${UBOOT_TRAVIS_BUILD_DIR} -w
--board ${TEST_PY_BD}; --board ${TEST_PY_BD};
exit $ret; exit $ret;