mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-08-25 06:51:11 +02:00
Merge bitcoin/bitcoin#32970: ci: Enable more shellcheck
fa1fd07468
ci: Enable more shellcheck (MarcoFalke) Pull request description: shellcheck is often the main "reviewer" of CI code written in Bash, so it seems odd to disable it by putting commands into `bash -c "cmd..."`. Fix that by removing `bash -c`, where it isn't intended and where the removal is easily possible. ACKs for top commit: hebasto: ACKfa1fd07468
. Tree-SHA512: 6412dd3f8d702bca7762a8f1be3f9d2782132936fcc7ae5c31690b594e04f69708110e6f6233d5a61901289d13c7089ab5646a2c3ef2266fffc36d0543f4b7ae
This commit is contained in:
@@ -122,7 +122,11 @@ if [[ "${RUN_TIDY}" == "true" ]]; then
|
|||||||
BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
|
BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
bash -c "cmake -S $BASE_ROOT_DIR -B ${BASE_BUILD_DIR} $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( (cat $(cmake -P "${BASE_ROOT_DIR}/ci/test/GetCMakeLogFiles.cmake")) && false)"
|
bash -c "cmake -S $BASE_ROOT_DIR -B ${BASE_BUILD_DIR} $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || (
|
||||||
|
# shellcheck disable=SC2046
|
||||||
|
cat $(cmake -P "${BASE_ROOT_DIR}/ci/test/GetCMakeLogFiles.cmake")
|
||||||
|
false
|
||||||
|
)
|
||||||
|
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
cmake --build "${BASE_BUILD_DIR}" "$MAKEJOBS" --target all $GOAL || (
|
cmake --build "${BASE_BUILD_DIR}" "$MAKEJOBS" --target all $GOAL || (
|
||||||
|
Reference in New Issue
Block a user