Repository navigation
backport: v0.26 bitcoin#28138, bitcoin#28187, bitcoin#28353, bitcoin#27976 - #124
Conversation
9967dcc to
bf06643
Compare
|
Branch rewritten at
🤖 backportsys, on behalf of the Dash backport pipeline. |
fabc04a ci: Keep system env vars as-is (MarcoFalke) fa8dcdc ci: Set PATH inside the CI env (MarcoFalke) fac229a ci: Remove P_CI_DIR and --workdir (MarcoFalke) Pull request description: This fixes a bug where the `$PATH` from the host is used inside the container. This will lead to bugs when the `$PATH` is different. For example on a host of Fedora 38, and a container of `debian:bullseye`. This can be tested with the `FILE_ENV=./ci/test/00_setup_env_arm.sh` CI env. On master: ``` Error: crun: executable file `bash` not found in $PATH: No such file or directory: OCI runtime attempted to invoke a command that was not found ``` On this pull: (everything passes) ACKs for top commit: TheCharlatan: lgtm ACK fabc04a Tree-SHA512: 51d2affed91624d0e5b43a3ee1e696313f934e05fde6b5a19e8ac4e6666c1e7b667a444bf3de3f77190bcd00e81efb7576196afb0f6b5e788d1a50e7ddb28d7e Dash adaptations: - ci/test/00_setup_env.sh: new BASE_SCRATCH_DIR comment and BINS_SCRATCH_DIR go where Dash already defines BASE_SCRATCH_DIR (after MAKEJOBS), not next to BASE_ROOT_DIR as upstream - ci/test/00_setup_env.sh: ci/retry PATH export removed as upstream; no Dash consumer of 00_setup_env.sh (ci/dash/*) uses CI_RETRY_EXE, so nothing needs it moved elsewhere Not applicable to Dash (intentionally omitted): - ci/test/04_install.sh: Dash removed this docker env-file pipeline (e9b40c4); ci/dash/* passes only explicit -e vars, so host HOME/PATH/USER never leak into the container
9658d0d ci: Run "macOS native x86_64" job on GitHub Actions (Hennadii Stepanov) Pull request description: From bitcoin#28098: > Thus, someone would have to sponsor an amount of roughly 5kUSD/mo for those two tasks. > If the goal is to stay on a free plan, I think the only option is GitHub Actions CI. --- **IMPORTANT NOTE**. We currently ship macOS release binaries for both architectures: `x86_64` and `arm64`. If this PR gets merged, only `x86_64` architecture will be tested on CI, which implies some [drawbacks](bitcoin#28187 (comment)). However, it has never been the case that our CI tested both architectures simultaneously. And we hope that GitHub Actions will soon host macOS `arm64` runners. Historically, we moved from `x86_64` to `arm64` in bitcoin#26388 less than a year ago. --- Security concerns: - bitcoin#28098 (comment) - bitcoin#28098 (comment) `GITHUB_TOKEN` permissions (from the build log in my personal repo): ``` 2023-07-27T07:30:17.8313534Z ##[group]GITHUB_TOKEN Permissions 2023-07-27T07:30:17.8314113Z Contents: read 2023-07-27T07:30:17.8314608Z Metadata: read 2023-07-27T07:30:17.8314957Z Packages: read 2023-07-27T07:30:17.8315233Z ##[endgroup] ``` Comparison of resources: | Resource | Current, Cirrus CI | Suggested, GitHub Actions | |---|:-:|:-:| | CPU | 4 | 4 \*\* | | RAM, GB | 8 | 14 | **\*\* NOTE**: However, [docs](https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources) are mentioning: > 3-core CPU (x86_64) ACKs for top commit: MarcoFalke: re-ACK 9658d0d 🏂 achow101: ACK 9658d0d jarolrod: ACK 9658d0d Tree-SHA512: 6123e68e6784cdf4e53c3e77b435709261db21f09091af2c22e667d3816a305fffb9d617297a5bc1bda18aaba84a6e210cec6a75c52afa7746a3780a67b69865 Dash adaptations: - ci/test/00_setup_env_mac_native.sh: renamed from the arm64 file with HOST=x86_64-apple-darwin and CCACHE_MAXSIZE=400M; Dash's CONTAINER_NAME=ci_macos and --disable-miner are kept - .github/workflows/ci.yml: not added; Dash runs CI through build.yml and ci/dash/matrix.sh, has no native macOS job, and ci/test_run_all.sh, which this workflow calls, was removed from Dash Not applicable to Dash (intentionally omitted): - .cirrus.yml: Dash removed .cirrus.yml (dashpay#6704); the Cirrus macOS arm64 task this hunk deletes never existed in Dash - .github/workflows/ci.yml: Bitcoin's GitHub Actions macOS job calls ci/test_run_all.sh, which Dash removed (e9b40c4); Dash's GHA CI is build.yml + ci/dash/*.sh and has no native macOS job
…from s390x task fa70cbd ci: Remove unused TEST_RUNNER_ENV="LC_ALL=C" from s390x task (MarcoFalke) fa33354 ci: Remove /ro_base bind mount (MarcoFalke) fa0df9d doc: Remove sudo from command that is already run as root (MarcoFalke) Pull request description: Remove some CI stuff no longer needed. ACKs for top commit: fanquake: ACK fa70cbd - did not test the s390x job. Tree-SHA512: 3a6ed0cfc855a92c2f834e59494c0a19a5647510247aece5e40a1aa78074894fe7454e684a1ea1f8f0662c50ac1caf2e390398b0fcfbf81544e6488fa9b8915e Dash adaptations: - ci/test/00_setup_env_s390x.sh: only the copyright bump applies; Dash's file never had TEST_RUNNER_ENV="LC_ALL=C" (or the CI_IMAGE_NAME_TAG context line), so nothing to remove Not applicable to Dash (intentionally omitted): - .cirrus.yml: Dash removed .cirrus.yml (dashpay#6704); the hunk only edits a swapfile setup comment with no Dash counterpart - ci/test/04_install.sh: Dash removed the staged Bitcoin Core CI pipeline (e9b40c4); Dash's GHA-based ci/dash scripts have no /ro_base bind mount or docker run
fa15f7e ci: Remove no longer applicable section (MarcoFalke) fa378be ci: Start with clean env (MarcoFalke) fa8c250 ci: Limit scope of some env vars (MarcoFalke) Pull request description: Starting with a clean `env` should help to avoid non-determinism, such as the one fixed in bitcoin#27739 (comment) ACKs for top commit: dergoegge: utACK fa15f7e Tree-SHA512: 716b264217557b6524dab92d5a2a8d61ecb982dff475bd0cf5a763070b4c5916cd5995e764eb5d67d9cf2428c29d5fc2f42b32941b54c7c3053123ce448171e5 Dash adaptations: - ci/test/00_setup_env.sh: SDK_URL removed from Dash's rewritten defaults block; Dash's releases/$HOST, DOCKER_PACKAGES and Docker-specific lines kept - ci/test/00_setup_env_mac.sh: SDK_URL moved here as upstream does; applied cleanly - ci/README.md: Dash's README is kept unchanged; it has no local-run section and no test_run_all.sh to wrap in a clean env Not applicable to Dash (intentionally omitted): - ci/README.md: Dash removed the 'Running a Stage Locally' section and has no ci/test_run_all.sh, so there is no command to wrap in env -i - ci/README.md: The 'no FILE_ENV' text upstream drops is already gone in Dash; its 'values left out' fallback sentence still holds, since matrix.sh always picks a FILE_ENV - ci/test/04_install.sh: Dash deleted 04_install.sh; Dash sets the sanitizer options in ci/dash/matrix.sh, not in an install step - ci/test/06_script_b.sh: Dash deleted 06_script_b.sh; ci/dash/matrix.sh already sets the *SAN_OPTIONS and is sourced only by build, test and lint steps
bf06643 to
34f8fb4
Compare
The 'Require a milestone' job only checks the pull request's metadata: it failed because no milestone is set (MILESTONE is empty), not because of any code. This branch changes nothing under .github, so check-milestone.yml is the same as on develop. Setting a milestone on the PR will clear it; rerunning CI alone won't. 🤖 backportsys, on behalf of the Dash backport pipeline. |
The 'Require a milestone' job (.github/workflows/check-milestone.yml) failed because the pull request has no milestone set (MILESTONE was empty). It checks PR metadata, not code: this branch only changes ci/ scripts and never touches that workflow. Set a milestone on the PR and the check will pass; rerunning it without one will fail again. 🤖 backportsys, on behalf of the Dash backport pipeline. |
The 'Require a milestone' job checks PR metadata: it failed because no milestone is set on the pull request (MILESTONE is empty in the log), not because of anything in the code. This branch does not touch .github/ or check-milestone.yml; a maintainer needs to set a milestone on the PR. 🤖 backportsys, on behalf of the Dash backport pipeline. |
|
merged as dashpay#8007 |
Automated Bitcoin Core v0.26 backports, batch
backport-0.26-b203-misc.7dcef9cc29ce6c50e25ac8407a8e5734f8fb47adProvenance
Each commit passed: cherry-pick (adapted by an Opus lane only where conflicts existed), build, touched tests, a mechanical diff-of-diffs check (every upstream hunk landed; no added line without an upstream counterpart), and an independent Opus verification lane where anything was adapted. Gate rows and lane artifacts are in the backportsys DB.