Skip to content

chore: switch altdoc from recursive-qmd-search branch to main - #184

Merged
d-morrison merged 4 commits into
mainfrom
chore/altdoc-main-branch
Aug 20, 2026
Merged

chore: switch altdoc from recursive-qmd-search branch to main#184
d-morrison merged 4 commits into
mainfrom
chore/altdoc-main-branch

Conversation

@d-morrison

Copy link
Copy Markdown
Collaborator

The main branch of d-morrison/altdoc is 268 commits ahead of recursive-qmd-search and 0 behind. Switching to @main for both rpt and matt.contracts.

Comment thread .github/workflows/docs.yaml Outdated
Comment thread .github/workflows/docs.yaml Outdated
Comment thread .github/workflows/copilot-setup-steps.yml Outdated
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

Comment thread .github/workflows/docs.yaml Outdated
Comment thread .github/workflows/docs.yaml Outdated
Comment thread .github/workflows/copilot-setup-steps.yml Outdated
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@d-morrison

Copy link
Copy Markdown
Collaborator Author

Working on this --- paws off until I'm done.

…rkflows

Addresses three blocking issues flagged across the PR's review rounds:

- docs.yaml: extra-packages block still carried unresolved
  `<<<<<<< Updated upstream` / `=======` / `>>>>>>> Stashed changes`
  markers from the altdoc branch switch, with both quarto-dev/quarto-r
  (correct R package) and quarto-dev/quarto (CLI repo, not installable
  as an R package) present. Resolved to keep d-morrison/altdoc@main and
  quarto-dev/quarto-r.
- docs.yaml: the latest_stable_tag GITHUB_OUTPUT line was corrupted to
  `echo "latest_stable_mainAG" >> "$GITHUB_OUTPUT"`, breaking the
  stable /latest-tag/ deploy logic. Restored to
  `echo "latest_stable_tag=$LATEST_STABLE_TAG" >> "$GITHUB_OUTPUT"`.
- copilot-setup-steps.yml: `needs: checkmain` referenced an
  unrecognized Config/Needs/* value (DESCRIPTION only defines
  Config/Needs/website). Restored to `needs: check`.
@github-actions

Copy link
Copy Markdown
Contributor

Claude finished reviewView run


All three previously-blocking issues have been fixed. Here's the review.

Code review: PR #184 (Morrison-Lab/rpt)

This is a follow-up round. The prior review (posted here, run 32343717481) verdicted Needs more work, citing three blocking issues. The PR head has since moved to a new commit (10bdb99c), and I re-fetched both affected workflow files directly at that commit to verify:

  1. .github/workflows/docs.yaml extra-packages: block (line 143–147) — now clean: no conflict markers, single correct line d-morrison/altdoc@main, quarto-dev/quarto-r correctly retained. Fixed.
  2. .github/workflows/docs.yaml line 85 — now reads echo "latest_stable_tag=$LATEST_STABLE_TAG" >> "$GITHUB_OUTPUT", the correct key=value form. Fixed.
  3. .github/workflows/copilot-setup-steps.yml line 89 — now reads needs: check (unchanged from upstream). Fixed.

The diff (gh pr diff 184) is now exactly what the PR describes plus tidy supporting changes:

  • copilot-setup-steps.yml / docs.yaml: two one-line swaps of d-morrison/altdoc@recursive-qmd-searchd-morrison/altdoc@main, matching the PR description ("main is 268 commits ahead of recursive-qmd-search, 0 behind").
  • NEWS.md: a new bullet documenting the altdoc dependency switch — this satisfies the root CLAUDE.md "Add a NEWS.md bullet for any user-facing change" / news.yaml changelog-check requirement. Good addition since the prior rounds noted no entry was strictly required for CI-only changes, but including one here is harmless and arguably more correct since it documents an infra dependency change contributors may care about.
  • DESCRIPTION: dev version bump 1.0.2.90021.0.2.9003 (routine, matches the NEWS.md change), and Config/roxygen2/version 8.0.08.1.0 — already reviewed in the prior round (verified as a real, current CRAN roxygen2 release, and confirmed R-check-docs.yml doesn't hardcode an expected version), so re-confirmed as non-blocking.

No new issues found. No CLAUDE.md violations, no bugs, nothing scope-creeping beyond the stated intent now that the corrupted lines are gone.

Verdict

Ready for merge — all three previously-blocking issues (unresolved merge-conflict markers, corrupted GITHUB_OUTPUT line, corrupted needs: input) are fixed as of commit 10bdb99c208ed4891528d46e416a8c0346fe5815, and the diff now matches its stated scope.

Reviewed commit: 10bdb99

@github-actions

Copy link
Copy Markdown
Contributor

💰 Cost: $0.8574 (review) — run

@github-actions

Copy link
Copy Markdown
Contributor
PR Preview Action v1.8.1

QR code for preview link

🚀 View preview at
https://Morrison-Lab.github.io/rpt/pr-preview/pr-184/

Built to branch gh-pages at 2026-08-20 18:41 UTC.
Preview will be ready when the GitHub Pages deployment is complete.

@d-morrison
d-morrison merged commit 9455ce8 into main Aug 20, 2026
54 checks passed
@d-morrison
d-morrison deleted the chore/altdoc-main-branch branch August 20, 2026 18:50
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.

1 participant