ci(P0): resolve committed conflict markers in build.yml test allowlist (master CI red since #271) - #311
Merged
Conversation
Commit b4126e8 (#271 merge) landed unresolved git conflict markers (<<<<<<< / ======= / >>>>>>>) inside the Build tests --target allowlist at both the Release and ASan+UBSan jobs, breaking the cmake --build line and turning the build.yml workflow red on master since that merge. Both conflict sides are dgb test targets; resolve as the token union: keep dgb_aux_parent_coinbase_parity_test (#298) AND add the dgb_template_capture_test (#271) target. Drift-guard passes (59 targets); YAML parses; diff fenced to .github/workflows/build.yml only.
frstrtr
added a commit
that referenced
this pull request
Jun 22, 2026
…#312) #310 landed the -DAUX_DOGE opt-in seam (option + add_compile_definitions in src/impl/dgb/CMakeLists.txt; #ifdef AUX_DOGE in coin/node.hpp) but nothing in CI exercises the flag-ON path, so the dual-parent stretch seam could rot dark between now and M3. Add a dedicated coin-dgb-auxdoge job that configures with -DCOIN_DGB=ON -DAUX_DOGE=ON and builds the c2pool-dgb binary, so the #ifdef AUX_DOGE seam is compiled on every PR. Default build (flag OFF) is unchanged and still covered by the linux + dgb-smoke jobs. Workflow file only; no source or shared-base touch. Stacked on dgb/ci-fix-build-yml-conflict-markers (#311) because that is the only clean build.yml base while master CI is red; rebase to master once #311 lands. Co-authored-by: frstrtr <frstrtr@users.noreply.github.com>
frstrtr
added a commit
that referenced
this pull request
Jun 23, 2026
…rkers ci(P0): resolve committed conflict markers in build.yml test allowlist (master CI red since #271)
frstrtr
added a commit
that referenced
this pull request
Jun 23, 2026
…#312) #310 landed the -DAUX_DOGE opt-in seam (option + add_compile_definitions in src/impl/dgb/CMakeLists.txt; #ifdef AUX_DOGE in coin/node.hpp) but nothing in CI exercises the flag-ON path, so the dual-parent stretch seam could rot dark between now and M3. Add a dedicated coin-dgb-auxdoge job that configures with -DCOIN_DGB=ON -DAUX_DOGE=ON and builds the c2pool-dgb binary, so the #ifdef AUX_DOGE seam is compiled on every PR. Default build (flag OFF) is unchanged and still covered by the linux + dgb-smoke jobs. Workflow file only; no source or shared-base touch. Stacked on dgb/ci-fix-build-yml-conflict-markers (#311) because that is the only clean build.yml base while master CI is red; rebase to master once #311 lands. Co-authored-by: frstrtr <frstrtr@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
P0 — master CI red
Commit
b4126e8b6(the #271 merge) landed unresolved git conflict markers (<<<<<<< HEAD/=======/>>>>>>> 38094399e) inside theBuild tests--targetallowlist, at BOTH the Release (linux) and ASan+UBSan jobs. Those marker lines became shell tokens in thecmake --buildinvocation, so thebuild.ymlworkflow has completed failure on master since that merge (latest: a80b272 / #310 merge).Fix (dgb-only, fenced to .github/workflows/build.yml)
Both conflict sides are dgb test targets that differ only by which new target each added. Resolved as the token union:
dgb_aux_parent_coinbase_parity_test(dgb: aux-parent coinbase serialization parity baseline KAT (D0) #298), ANDdgb_template_capture_test(dgb(#82): reconstruct won block from captured GBT template, not share refs #271)Both targets are real (
src/impl/dgb/test/CMakeLists.txt:447and:465).Verification
yaml.safe_loadparses cleantools/ci/check_test_target_allowlist.py-> drift-guard OK (59 targets across 5 lanes).github/workflows/build.ymlonly (+2/-10)GPG-signed @696a23823.