Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run clang_format_check in deterministic location #768

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Run clang_format_check in deterministic location #768

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0acf08f
Run clang_format_check in deterministic location
wxmerkt Jan 6, 2022
0fe2bd9
Fix logic to run clang-format in deterministic location
wxmerkt Jan 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions industrial_ci/src/tests/clang_format_check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ function prepare_clang_format_check() {
true
}

function run_clang_format_check() {
local err=0
local path
ici_make_temp_dir path
function install_clang_format_check() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function never gets called..

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, thanks for pointing this out - I made a wrong assumption about the calling order. I've now simplified it. It works by e.g. setting BEFORE_RUN_CLANG_FORMAT_CHECK="wget [my config] -O /tmp/clang_format_check/[project]/.clang-format" along with ADDITIONAL_DEBS=wget in this case.

local path=/tmp/clang_format_check
mkdir -p "$path"
ici_cleanup_later "$path"

# Check whether a specific version of clang-format is desired
local clang_format_executable="clang-format${CLANG_FORMAT_VERSION:+-$CLANG_FORMAT_VERSION}"
Expand All @@ -34,6 +34,11 @@ function run_clang_format_check() {
local sources=()
ici_parse_env_array sources TARGET_WORKSPACE
ici_step "prepare_sourcespace" ici_prepare_sourcespace "$path" "${sources[@]}"
}

function run_clang_format_check() {
local err=0
local path=/tmp/clang_format_check

ici_time_start run_clang_format_check
while read -r file; do
Expand Down