From abb29959ee26523f59b7e1e4ef7e5787d13fecbb Mon Sep 17 00:00:00 2001 From: Sergi Blanch Torne Date: Mon, 14 Oct 2024 14:17:24 +0200 Subject: [PATCH] ci: shellcheck requires better 'boolean or' syntax MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some merge requests are failing due to `.gitlab-ci/run-shellcheck.sh` failing on the 'yaml-toml-shell-test' because an 'or', on an elif, in the meson's build needs to be reformulated. Fixes: afab416be48 ("ci: enable IPO/LTO only for nightly builds") Signed-off-by: Sergi Blanch Torne Acked-by: Guilherme Gallo Reviewed-by: Pavel Ondračka Part-of: --- .gitlab-ci/meson/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh index 3aa0a9e5971..479c4becb6d 100755 --- a/.gitlab-ci/meson/build.sh +++ b/.gitlab-ci/meson/build.sh @@ -107,7 +107,7 @@ case $CI_PIPELINE_SOURCE in # /tmp/ccWlDCPV.s:15250880: Error: operand out of range (0xfffffffffdd4e688 is not between 0xfffffffffe000000 and 0x1fffffc) LTO=false # enable one by one for now - elif [ "$CI_JOB_NAME" == "fedora-release" || "$CI_JOB_NAME" == "debian-build-testing" ]; then + elif [ "$CI_JOB_NAME" == "fedora-release" ] || [ "$CI_JOB_NAME" == "debian-build-testing" ]; then LTO=true else LTO=false