Skip to content

cmake: Fix "tidy" CI job#205

Merged
hebasto merged 2 commits into
cmake-stagingfrom
240521-cmake-FI
May 23, 2024
Merged

cmake: Fix "tidy" CI job#205
hebasto merged 2 commits into
cmake-stagingfrom
240521-cmake-FI

Conversation

@hebasto
Copy link
Copy Markdown
Owner

@hebasto hebasto commented May 21, 2024

Fixes the first point from bitcoin#29790 (comment):

  1. Cannot open mapping file '/ci_container_base/ci/scratch/build-/contrib/devtools/iwyu/bitcoin.core.imp': No such file or directory.

hebasto added 2 commits May 21, 2024 16:10
Do not reference the `HOST` variable before defining it.
Fix `contrib/devtools/iwyu/bitcoin.core.imp` file location.
@hebasto
Copy link
Copy Markdown
Owner Author

hebasto commented May 22, 2024

See the recent push to bitcoin#29790 for the CI logs.

Comment thread ci/test/00_setup_env.sh
# Folder where the build result is put (bin and lib).
export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out}
# Folder where the build is done (dist and out-of-tree build).
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build-$HOST}
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Why isn't this a problem upstream?

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

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

Because that was suggested only in #142.

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

HOST should be set (for cross) when importing the CI config in this line:

echo "Setting specific values in env"

So an alternative would be (in this context) to fall back to build-native, if the HOST isn't set.

But this is fine, too.

@hebasto
Copy link
Copy Markdown
Owner Author

hebasto commented May 23, 2024

Friendly ping @maflcko :)

Copy link
Copy Markdown

@maflcko maflcko left a comment

Choose a reason for hiding this comment

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

lgtm

Comment thread ci/test/00_setup_env.sh
# Folder where the build result is put (bin and lib).
export BASE_OUTDIR=${BASE_OUTDIR:-$BASE_SCRATCH_DIR/out}
# Folder where the build is done (dist and out-of-tree build).
export BASE_BUILD_DIR=${BASE_BUILD_DIR:-$BASE_SCRATCH_DIR/build-$HOST}
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

HOST should be set (for cross) when importing the CI config in this line:

echo "Setting specific values in env"

So an alternative would be (in this context) to fall back to build-native, if the HOST isn't set.

But this is fine, too.

@hebasto hebasto merged commit f5f951d into cmake-staging May 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

tests Tests, benchmarks, fuzzing, CI etc

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants