Fixes #30028 (modulo lint and tidy CI).
The error on current master in a worktree is:
0$ git worktree add ./main origin/master && cd ./main
1$ MAKEJOBS="-j$(nproc)" FILE_ENV="./ci/test/00_setup_env_mac_cross.sh" ./ci/test_run_all.sh
2...
3+ git config --global ci.base-install-done true
4fatal: not a git repository: /root/b-c-ci/.git/worktrees/main
So just use a plain file, instead of git. Also, enable pipefail while touching this bash script.
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32767.
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | willcl-ark |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
🚧 At least one of the CI tasks failed.
Task lint: https://github.com/bitcoin/bitcoin/runs/44283549226
LLM reason (✨ experimental): The CI failure is caused by errors detected during the lint checks, specifically from the shell script lint warning (SC2086) and a spelling mistake flagged by codespell, indicating that the linting step did not pass.
Try to run the tests locally, according to the documentation. However, a CI failure may still happen due to a number of reasons, for example:
Possibly due to a silent merge conflict (the changes in this pull request being incompatible with the current code in the target branch). If so, make sure to rebase on the latest commit of the target branch.
A sanitizer issue, which can only be found by compiling with the sanitizer and running the affected test.
An intermittent issue.
Leave a comment here, if you need help tracking down a confusing failure.
rsync --archive will preserve owner and group, which is then required to
be handled by adding a git safe.directory workaround.
Remove the need for the workaround by only preserving permissions during
the recursive rsync copy.
Otherwise, a possible failure is silently ignored.
Also, rename the file, while touching it, to clarify installing is the
first step.
tACK fa68dcb207c3431ecf1ab6caac588062c06a19c1
Tested working in a worktree.
It’s a much simpler change than my own (and I like it for that reason).
I still don’t see a particularly “clean” way to have the other two jobs work without something more like #31787, as they require the legitimate (i.e. not empty/dummy) .git directory to be mounted in the container.
But this feels good for now.
I still don’t see a particularly “clean” way to have the other two jobs work without something more like #31787, as they require the legitimate (i.e. not empty/dummy)
.gitdirectory to be mounted in the container.
I haven’t tried this, but git init ./ && git add ./ may be a easy one-line fix for those, but I can try in a follow-up, if someone wants me to.
The two other changes/bugfixes here should be independent improvements unrelated to worktrees anyway.
Labels
Tests