Skip to content

backport: bitcoin#28138, bitcoin#28187, bitcoin#28353, bitcoin#27976 - #8007

Merged
PastaPastaPasta merged 4 commits into
dashpay:developfrom
thepastaclaw:backport-0.26-b203-misc
Nov 1, 2026
Merged

PastaPastaPasta merged 4 commits into
dashpay:developfrom
thepastaclaw:backport-0.26-b203-misc

Conversation

@DCG-Claude

@DCG-Claude DCG-Claude commented Oct 31, 2026 •

Copy link
Copy Markdown
Collaborator

Issue being fixed or feature implemented

Backports 4 Bitcoin Core v0.26 pull request(s) to Dash.

What was done?

  • ci: Run "macOS native x86_64" job on GitHub Actions bitcoin/bitcoin#28187 — ci: Run "macOS native x86_64" job on GitHub Actions.
    Upstream: ci: Run "macOS native x86_64" job on GitHub Actions bitcoin/bitcoin#28187 (merge b97b050). Dash commit: ce6c50e.
    Renames the macOS native CI env script back to 00_setup_env_mac_native.sh and switches it to x86_64 with a 400M ccache, as upstream does, while keeping Dash's own settings. Upstream's Cirrus task removal and its new GitHub Actions ci.yml are not carried over because Dash uses neither Cirrus nor upstream's workflow layout.

    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):

  • ci: Keep system env vars as-is (bugfix) bitcoin/bitcoin#28138 — ci: Keep system env vars as-is (bugfix).
    Upstream: ci: Keep system env vars as-is (bugfix) bitcoin/bitcoin#28138 (merge 4c57e53). Dash commit: 7dcef9c.
    This backports ci: Keep system env vars as-is (bugfix) bitcoin/bitcoin#28138's changes to ci/lint/04_install.sh and ci/test/00_setup_env.sh: retry is now added to PATH in the lint install script, BINS_SCRATCH_DIR moves into the shared env setup, and the global ci/retry PATH export is dropped. The ci/test/04_install.sh hunks are left out because Dash already removed that docker env-file pipeline (e9b40c4), and its ci/dash/* CI never passes host HOME, PATH or USER into the container.

    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
  • ci: Remove /ro_base bind mount, Remove LC_ALL=C from s390x task bitcoin/bitcoin#28353 — ci: Remove /ro_base bind mount, Remove LC_ALL=C from s390x task.
    Upstream: ci: Remove /ro_base bind mount, Remove LC_ALL=C from s390x task bitcoin/bitcoin#28353 (merge df5af11). Dash commit: c8407a8.
    Backports ci: Remove /ro_base bind mount, Remove LC_ALL=C from s390x task bitcoin/bitcoin#28353: applies the s390x copyright bump; the LC_ALL=C TEST_RUNNER_ENV line it removes was already gone in Dash via the earlier ci: Reduce use of bash -c bitcoin/bitcoin#28954 backport. The .cirrus.yml and ci/test/04_install.sh hunks don't apply because Dash has neither file and its GitHub Actions CI has no /ro_base bind mount.

    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):

  • ci: Start with clean env bitcoin/bitcoin#27976 — ci: Start with clean env.
    Upstream: ci: Start with clean env bitcoin/bitcoin#27976 (merge cd5d2f5). Dash commit: 34f8fb4.
    Moves the SDK_URL default from the generic ci/test/00_setup_env.sh into Dash's macOS cross config (00_setup_env_mac_cross.sh, the counterpart of upstream's 00_setup_env_mac.sh). The upstream README and 04_install.sh/06_script_b.sh sanitizer-option hunks do not apply: Dash has its own CI layout and already exports sanitizer options in ci/dash/matrix.sh.

    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

How Has This Been Tested?

Breaking Changes

None beyond the upstream changes themselves.

Checklist:

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

@DCG-Claude
DCG-Claude requested a review from UdjinM6 as a code owner October 31, 2026 22:37
@DCG-Claude

DCG-Claude commented Oct 31, 2026 •

Copy link
Copy Markdown
Collaborator Author

Maintainer controls

Tick a box; backportsys acts within a few minutes, then clears it. For other requests, leave a review comment.

  • 🔒 Hands off — stop every automated update to this branch
  • 🔄 Rebase onto current develop
  • ❌ Close — abandon this batch and release its items

Hands off persists after its box clears: no automated branch updates until operator release (not tracker Release hold). Close abandons the batch and releases its items.

Review effort

🟡 quick overall (3 trivial, 1 quick).

🟢 identical to upstream, or small declared differences in docs, tests or build scripts · 🟡 a few lines of Dash code differ or were placed differently, upstream code skipped as not needed, an undeclared omission, or release plumbing (depends, guix, workflows, test framework) differs · 🔴 larger code differences, any difference in consensus, key or Dash-subsystem code, or a decision below. The adapting lane's explanations are in the PR description and each commit body.

Upstream Effort Where it differs from upstream
bitcoin#28187 🟡 quick upstream files Dash doesn't have: .cirrus.yml; skips upstream hunks as not needed in Dash: .github/workflows/ci.yml
bitcoin#28138 🟢 trivial skips upstream hunks as not needed in Dash: ci/test/04_install.sh
bitcoin#28353 🟢 trivial docs/tests/build differ in ci/test/00_setup_env_s390x.sh; upstream files Dash doesn't have: .cirrus.yml; skips upstream hunks as not needed in Dash: ci/test/04_install.sh
bitcoin#27976 🟢 trivial docs/tests/build differ in ci/test/00_setup_env_mac_cross.sh; upstream files Dash doesn't have: ci/test/00_setup_env_mac.sh; skips upstream hunks as not needed in Dash: ci/README.md, ci/test/04_install.sh, ci/test/06_script_b.sh

Needs maintainer input

  • fork CI failed at this head (34f8fb47ad)

Fork gate: thepastaclaw#124 at 34f8fb4 (CI failed).

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 31, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-01T04:13:12.667777Z 34f8fb4 New commits
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@thepastaclaw

thepastaclaw commented Oct 31, 2026 •

Copy link
Copy Markdown
Collaborator

✅ Final review complete — no blockers (commit 34f8fb4) · triage: low

@coderabbitai

coderabbitai Bot commented Oct 31, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

No actionable comments were generated in the recent review.

Recent review info
Run configuration
  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Repository UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 03bca2c0-89c1-4327-9ce6-35736c3b0bbb
Commits

Reviewing files that changed from the base of the PR and between bf06643 and 34f8fb4.

Files selected for processing: 1
  • ci/test/00_setup_env.sh
Files with no reviewable changes: 1
  • ci/test/00_setup_env.sh

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 3 remain after this review.

Walkthrough

The CI lint setup adds ci/retry to PATH. The common test setup adds BINS_SCRATCH_DIR and removes its SDK_URL default and ci/retry PATH addition. The macOS cross setup adds an SDK_URL default. The macOS native setup changes the build host to x86_64-apple-darwin and increases CCACHE_MAXSIZE to 400M. Two setup scripts update their copyright notices.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

  • dashpay/dash#7942: Both PRs change macOS SDK provisioning configuration.
  • dashpay/dash#7932: This PR renames the macOS cross-compile setup script that receives the SDK_URL default.
  • dashpay/dash#7959: Both PRs change ci/lint/04_install.sh to support retry executable use.
Merge Risk: Minimal · up to 34f8f

The CI setup changes appear mergeable after normal checks; no affected build or test path was identified.

Pre-merge checks: Passed 5
Check name Status Explanation
Title check Passed The title clearly identifies that the pull request backports four specific Bitcoin Core changes. It accurately summarizes the main change.
Description check Passed The description directly explains the four backported changes, Dash-specific adaptations, omitted upstream files, and reported testing results.
Docstring Coverage Passed No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentat…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.
Full details: Docstring Coverage

Explanation

No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentation-only edits and deletions within surviving functions are included; unchanged diff context and fully deleted functions are excluded. Analyzed 0 functions across 5 files.

Finishing Touches
Generate unit tests (beta)
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@thepastaclaw thepastaclaw left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Final validation — Phase 1 + Phase 2

Verified the supplied reviewer evidence against bf06643: one Dash-specific documentation suggestion remains, with no blocking correctness or backport-completeness findings. Static review only; current CI has passed both arm64 container builds, while dependency builds and lint remain pending. Cppcheck fails because the newer base workflow invokes test/lint/cppcheck-dash.py, which is absent from this older PR head; this is unrelated to the backported changes, and the milestone failure is a policy gate.

🟡 1 suggestion(s)

1 finding(s) not shown inline (the lines are not part of this PR's diff)

🟡 Suggestion: Release-process note still points at the SDK_URL export this PR removes
doc/release-process.md:98

The release instructions direct readers to SDK_URL in ci/test/00_setup_env.sh to determine whether CI uses Bitcoin's SDK package. This PR removes that definition from the linked file and relocates it to 00_setup_env_mac_cross.sh, so the reference no longer provides the information promised. At this head, the actual SDK download runs through contrib/containers/guix/scripts/setup-sdk, which independently defines SDK_URL. Update the link to that acquisition script or remove the outdated pointer. This is an affected Dash-specific documentation reference, not a request to change upstream behavior.

_Note: this step can be skipped if [our CI](https://github.com/dashpay/dash/blob/master/contrib/containers/guix/scripts/setup-sdk) still uses bitcoin's SDK package (see SDK_URL)_

source: glm-5.3-flash (phase1-reviewer: general)

Review provenance

Source: reviewer 1: glm-5.3-flash (agent: phase1-reviewer, role: general); reviewer 2: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 3: gpt-6.1-sol (agent: phase2-reviewer, role: backport-reviewer); reviewer 4: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); final verifier: gpt-6.1-sol (agent: sol-verifier, role: final-verifier)

  • Triage: low by gpt-6.1-sol (effort low) — The diff makes small, contained CI environment and platform configuration changes whose behavior is straightforward to verify and does not touch critical runtime surfaces.
  • Phase 1 reviewers: glm-5.3-flash — general (completed, effort high); agent phase1-reviewer
  • Phase 1 model: glm-5.3-flash — zai quota: 5h 52% left, weekly 59% left; passed over gemini-3.8-flash-high (antigravity quota lookup failed)
  • Fresh verifier: gpt-6.1-sol — final-verifier; agent sol-verifier
  • Phase 2 reviewers: gpt-6.1-sol — general (completed, effort medium); agent phase2-reviewer, gpt-6.1-sol — backport-reviewer (completed, effort medium); agent phase2-reviewer, gpt-6.1-sol — dash-core-commit-history (completed, effort medium); agent phase2-reviewer
🤖 Prompt for all review comments with AI agents
These findings are from an automated code review. Verify each finding against the current code and only fix it if needed.

In `doc/release-process.md`:
- [SUGGESTION] doc/release-process.md:98: Release-process note still points at the SDK_URL export this PR removes
  The release instructions direct readers to SDK_URL in ci/test/00_setup_env.sh to determine whether CI uses Bitcoin's SDK package. This PR removes that definition from the linked file and relocates it to 00_setup_env_mac_cross.sh, so the reference no longer provides the information promised. At this head, the actual SDK download runs through contrib/containers/guix/scripts/setup-sdk, which independently defines SDK_URL. Update the link to that acquisition script or remove the outdated pointer. This is an affected Dash-specific documentation reference, not a request to change upstream behavior.

@thepastaclaw thepastaclaw added the pastaclaw:commented thepastaclaw's latest review was comment-only label Nov 1, 2026
@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

CI failed at bf06643 on dashpay/dash: x86_64-apple-darwin / Build depends, Cppcheck / Run cppcheck

Both failures come from running develop's workflows against this branch's older tree. Develop 289c7f8 dropped the build-depends SDK fetch steps and builds the macOS SDK into the CI image, but this run's image came from the branch's ci.Dockerfile, which has no SDK, so clang had no sysroot and gmp configure found no working compiler. Cppcheck failed because develop's cppcheck.yml calls test/lint/cppcheck-dash.py, a name from develop d9e487e; the base still has test/lint/lint-cppcheck-dash.py. Rebasing onto develop fixes both. This branch is based on 853c6a0302, older than develop (9c119fc24e); it is being rebased onto develop and this is looked at again there.


🤖 backportsys, on behalf of the Dash backport pipeline.

@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

CI failed at bf06643 on dashpay/dash: Require a milestone

This check fails only because the pull request has no milestone set, which is not part of the code; set a milestone on the PR and it will pass.


🤖 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
@DCG-Claude
DCG-Claude force-pushed the backport-0.26-b203-misc branch from bf06643 to 34f8fb4 Compare November 1, 2026 04:10
@thepastaclaw thepastaclaw removed the pastaclaw:commented thepastaclaw's latest review was comment-only label Nov 1, 2026

@thepastaclaw thepastaclaw left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Re-review — Final validation — Phase 1 + Phase 2

Verified the complete diff at 34f8fb4 against the four upstream PRs and Dash's CI consumers; no blocking correctness or backport-adaptation defects were found, but the prior release-documentation finding remains valid. Current CI shows successful lint, Cppcheck, macOS and several other builds, and Linux tests; multiprocess, TSan, no-wallet builds and ASan tests remain pending, while the milestone-only policy check fails. Static verification only: no local builds or tests were run; the supplied base-drift evidence reports no merge conflicts or overlapping changed files.

🟡 1 suggestion(s)

1 finding(s) not shown inline (the lines are not part of this PR's diff)

🟡 Suggestion: Release-process note still points at the SDK_URL export this PR removes
doc/release-process.md:98

This note tells release builders to inspect SDK_URL in ci/test/00_setup_env.sh when deciding whether to create the macOS SDK tarball. This PR removes that variable from the linked file and relocates it to ci/test/00_setup_env_mac_cross.sh:9, leaving the documented lookup without the setting it names. Update the reference to the authoritative SDK provisioning configuration: the active CI image downloads its SDK in contrib/containers/ci/ci.Dockerfile. If the note instead intends to reference the retained SDK_URL default, link to the macOS cross configuration.

source: glm-5.3-flash (phase1-reviewer: general); gpt-6.1-sol (phase2-reviewer: general, backport-reviewer)

Review provenance

Source: reviewer 1: glm-5.3-flash (agent: phase1-reviewer, role: general); reviewer 2: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 3: gpt-6.1-sol (agent: phase2-reviewer, role: backport-reviewer); reviewer 4: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); reviewer 5: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 6: gpt-6.1-sol (agent: phase2-reviewer, role: backport-reviewer); reviewer 7: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); final verifier: gpt-6.1-sol (agent: sol-verifier, role: final-verifier)

  • Triage: low by gpt-6.1-sol (effort low) — The diff makes small, contained CI environment and platform configuration changes whose correctness is straightforward to verify and does not touch critical runtime surfaces.
  • Phase 1 reviewers: glm-5.3-flash — general (completed, effort high); agent phase1-reviewer
  • Phase 1 model: glm-5.3-flash — zai quota: 5h 99% left, weekly 56% left; passed over gemini-3.8-flash-high (antigravity quota lookup failed)
  • Fresh final gate: an independent Phase-2 review ran after iterative findings were reconciled
  • Fresh verifier: gpt-6.1-sol — final-verifier; agent sol-verifier
  • Phase 2 reviewers: gpt-6.1-sol — general (completed, effort medium); agent phase2-reviewer, gpt-6.1-sol — backport-reviewer (completed, effort medium); agent phase2-reviewer, gpt-6.1-sol — dash-core-commit-history (completed, effort medium); agent phase2-reviewer, gpt-6.1-sol — general (completed, effort medium); agent phase2-reviewer, gpt-6.1-sol — backport-reviewer (completed, effort medium); agent phase2-reviewer, gpt-6.1-sol — dash-core-commit-history (completed, effort medium); agent phase2-reviewer
🤖 Prompt for all review comments with AI agents
These findings are from an automated code review. Verify each finding against the current code and only fix it if needed.

In `doc/release-process.md`:
- [SUGGESTION] doc/release-process.md:98: Release-process note still points at the SDK_URL export this PR removes
  This note tells release builders to inspect SDK_URL in ci/test/00_setup_env.sh when deciding whether to create the macOS SDK tarball. This PR removes that variable from the linked file and relocates it to ci/test/00_setup_env_mac_cross.sh:9, leaving the documented lookup without the setting it names. Update the reference to the authoritative SDK provisioning configuration: the active CI image downloads its SDK in contrib/containers/ci/ci.Dockerfile. If the note instead intends to reference the retained SDK_URL default, link to the macOS cross configuration.

@thepastaclaw thepastaclaw added the pastaclaw:commented thepastaclaw's latest review was comment-only label Nov 1, 2026
@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

CI failed at 34f8fb4 on dashpay/dash: Require a milestone

Same PR-metadata check as on the fork: the job fails only because the pull request has no milestone set, and none of the backported commits changes .github/. Setting a milestone on the PR will clear it.


🤖 backportsys, on behalf of the Dash backport pipeline.

@PastaPastaPasta PastaPastaPasta added this to the 24.1 milestone Nov 1, 2026

@PastaPastaPasta PastaPastaPasta left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

utACK 34f8fb4; arguably we could just skip these but they're fine as is

@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

utACK 34f8fb4; arguably we could just skip these but they're fine as is

Thanks for the utACK. Since you said these CI backports are fine as they are, I'm keeping all four commits on the branch and leaving the code unchanged.


🤖 backportsys, on behalf of the Dash backport pipeline.

@PastaPastaPasta
PastaPastaPasta merged commit 63602c1 into dashpay:develop Nov 1, 2026
49 of 51 checks passed
@thepastaclaw thepastaclaw removed the pastaclaw:commented thepastaclaw's latest review was comment-only label Nov 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants