lint: Use consistent out-of-tree build for python and test_runner#30499
lint: Use consistent out-of-tree build for python and test_runner#30499fanquake merged 3 commits intobitcoin:masterfrom
Conversation
Previous code was confusing and brittle. For example, the full import "source ./ci/test/00_setup_env.sh" and $PATH overwrite was not needed. Fix it by simply copying the exe to /ci_retry and use that in $CI_RETRY_EXE. This is also a fix, because previously ci/lint_imagefile did use an empty $CI_RETRY_EXE.
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code CoverageFor detailed information about the code coverage, see the test coverage report. ReviewsSee the guideline for information on the review process.
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. HintsMake sure to run all tests locally, according to the documentation. The failure may happen due to a number of reasons, for example:
Leave a comment here, if you need help tracking down a confusing failure. |
0421a7f to
fac504d
Compare
This mirrors the build by ./ci/lint_imagefile, which is done out-of-tree in "/". Otherwise, there could be errors due to a dirty tree.
|
Thanks for fixing this so quickly! |
|
|
| @@ -62,3 +64,5 @@ MLC_VERSION=v0.18.0 | |||
| MLC_BIN=mlc-x86_64-linux | |||
| curl -sL "https://github.com/becheran/mlc/releases/download/${MLC_VERSION}/${MLC_BIN}" -o "/usr/bin/mlc" | |||
There was a problem hiding this comment.
Unrelated, but shouldn't every git clone have --depth=1 throughout this file?
There was a problem hiding this comment.
I may do this in a follow-up
|
utACK fa8d73e ran |
|
utACK fa8d73e Thanks for addressing @maflcko, this makes things much more sanitary. That said, our It appears that the will@ubuntu in ~/src/bitcoin on 2407-lint-fixes [$?] : 🐍 (bitcoin)
$ git ls-files --ignored --others --exclude-standard | rg pyenv
will@ubuntu in ~/src/bitcoin on 2407-lint-fixes [$?] : 🐍 (bitcoin)
✗ git ls-files --others --exclude-standard | rg pyenv
.pyenv/readme.mdI'll try an upstream fix so that we can avoid a future recurrence (with another file/dir) |
Yes, I know, but someone will need to create a pull request to pull in the mlc version that fixes this, if such a version exists. I think the consistency fixes here make sense either way. Fixing the bug is just a convenient side effect. |
fa7bee1 lint: Use git clone --depth=1 (MarcoFalke) fadb7c2 lint: Add missing docker.io prefix to ci/lint_imagefile (MarcoFalke) Pull request description: Currently, the `ci/lint_imagefile` may pick the wrong (non-native) architecture due to the missing prefix. For example, assuming the user has previously pulled an s390x image: ``` $ podman run --rm 'docker.io/s390x/debian:bookworm' dpkg --print-architecture exec /usr/bin/dpkg: exec format error ``` Now, `debian:bookworm` will refer to the same image: ``` $ podman run --rm 'debian:bookworm' dpkg --print-architecture exec /usr/bin/dpkg: exec format error ``` However, `docker.io/debian:bookworm` works fine: ``` $ podman run --rm 'docker.io/debian:bookworm' dpkg --print-architecture arm64 ``` (Also includes a nit-fix from #30499 (comment)) ACKs for top commit: paplorinc: utACK fa7bee1 hebasto: ACK fa7bee1. Tree-SHA512: 4b6d562c14c67bef984ad25f6a3a1ef7f1059dc2859c603c45083b36bcacafa3248fc74176e2e4626fdc39507e9353f458ddbc4077f805c03e970df46af02224
Fixes #30496
Seems odd to sometimes do an out-of-tree build (via
./ci/lint_imagefile, seetest/lint/README.md) and sometimes not (via Cirrus CI, see./ci/lint_run_all.sh).Fix it by doing an out-of-tree build consistently in the same location.
Also, fix
$CI_RETRY_EXE, while touching this.