Skip to content

Commit 633d8ea

Browse files
committed
Merge bitcoin/bitcoin#32970: ci: Enable more shellcheck
fa1fd07 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: ACK fa1fd07. Tree-SHA512: 6412dd3f8d702bca7762a8f1be3f9d2782132936fcc7ae5c31690b594e04f69708110e6f6233d5a61901289d13c7089ab5646a2c3ef2266fffc36d0543f4b7ae
2 parents 6cdc5a9 + fa1fd07 commit 633d8ea

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

ci/test/03_test_script.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,11 @@ if [[ "${RUN_TIDY}" == "true" ]]; then
122122
BITCOIN_CONFIG_ALL="$BITCOIN_CONFIG_ALL -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
123123
fi
124124

125-
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)"
125+
bash -c "cmake -S $BASE_ROOT_DIR -B ${BASE_BUILD_DIR} $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || (
126+
# shellcheck disable=SC2046
127+
cat $(cmake -P "${BASE_ROOT_DIR}/ci/test/GetCMakeLogFiles.cmake")
128+
false
129+
)
126130

127131
# shellcheck disable=SC2086
128132
cmake --build "${BASE_BUILD_DIR}" "$MAKEJOBS" --target all $GOAL || (

0 commit comments

Comments
 (0)